Merge branch 'branch1' into 'main'

Branch1 See merge request !1

Merge branch 'branch1' into 'main'
Branch1 See merge request !1
a594550a · jiang feng · a19d8b51 · 8aa83330 · a594550a · a594550a
Commit a594550a authored May 14, 2024 by jiang feng
20 changed files
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/batchtest.gradle.kts
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/batchtest.gradle.kts
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTestServer.kt
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchtestPlugin.kt
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/checksum.xml
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/checksum.xml
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/config/LICENSE
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/config/LICENSE
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/config/checkstyle/checkstyle-suppressions.xml
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/config/checkstyle/checkstyle-suppressions.xml
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/config/checkstyle/checkstyle.xml
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/config/checkstyle/checkstyle.xml
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/config/checkstyle/java.header.regex
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/config/checkstyle/java.header.regex
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/config/license.header.java
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/config/license.header.java
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/doap_JMeter.rdf
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/doap_JMeter.rdf
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/eclipse.md
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/eclipse.md
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/GrafanaJMeterTemplate.json
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/GrafanaJMeterTemplate.json
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/Test.jmx
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/Test.jmx
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/addons.txt
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/addons.txt
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/addons.xml
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/addons.xml
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/ant-jmeter-1.1.1.jar
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/ant-jmeter-1.1.1.jar
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/build.xml
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/build.xml
--- a/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/collapse.png
+++ b/apache-jmeter-5.5_src/apache-jmeter-5.5/extras/collapse.png