This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch bug_64553 in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 6eef616 Fix conflict add 0592978 Implement a new setting to allow the exclusion of embedded URLs add 3a8c6e9 Typo. Meant bug of course. add 6ef792e Partly revert unwanted nightly build comment in 58bf600130feb646291fbc3e228a8f97c8220773 add 81a6d67 Exclude Javascript and JSON from parsing for charsets from forms by proxy add 6fa1735 Add ThreadGroup in the mix instead of duplicate condition add b64a68c Don't use toString here, as it is not needed and target could be null add cf32f8e Don't use toString on format parameters and correct number of placeholders add af3958b Use format message placeholder instead of string concatenation, to make code clearer add 216a649 Use ThreadLocal.remove instead of set(null). It is safer add 9df1bfe Make sonarqube a bit happier and trigger a new build add d3a09ce Use Map#computeIfAbsent to simplify code add 5671589 Change to new jenkins nodes and correct filename-structure of nightlies add 2238e7c No need to call toString on argument to message format add 8f13913 Try to make jars available for sonar scanner add eeb5258 Use correct path for jars add 4159674 Seems to be the wrong path for libs, so remove it again add f381cda Use badge for new jenkins instance add 9d21839 Update utility jars spotbugs and checksum add 80718ad Add missing key id for spotbugs add 906918b Add missing key id for org.json:json add a1bc13f Correct typo: ley -> key add 44c0c7e Log status on start up, when splash screen is displayed add 53873bc Correct possible thread wake-up problem and typo add 0070acb Make use of newer Darklaf API to create laf menu items. add f2e1750 Update to Darklaf version 2.4.4 add 445df9f Fix to: Implement a new setting to allow the exclusion of embedded URLs add 0b13f13 Update Gradle to 6.6 add ceddfe7 Configure Gradle local build cache, add build scans, and use gradle-cache-action for GitHub CI add 7fd938f Correct typos in README.me add 19a207d Update to darklaf 2.4.5 add 28e11b8 Mention available darklaf properties. Ensure that 'darklaf.allowNativeCode' is set to 'true' if 'darklaf.decorations' is 'true'. add a146f6b Add changelog entry and use Boolean#getBoolean add 75fdc09 Make the splash screen application-modal rather than system-modal add 5eff144 Update SpotBugs to 4.1.2 (from 4.1.1), upgrade spotbugs-gradle-plugin to 4.5.0 (from 2.0.0) add 98c3552 Remove dependency between checkstyle and compilation tasks add 90ddca3 Do not execute SpotBugs by default add 9acded5 Fix Gradle warnings: duplicate entries in processResources, compile configuration add 769a2a1 Fix Gradle deprecations: replace testCompile with testImplementation add a0ed3e0 Update org.sonarqube Gradle plugin to 3.0 (from 2.7.1) add 3109b8b Add a checksum for sonarqube-gradle-plugin add 20ba58d Fall back to JMETER_HOME on startup to detect JMeter's installation directory add ba27712 Remove useless braces for one-liner lambda expression add b2d487c Correct documented name of generated CA when using proxy script recorder add fd8b994 Fall back to JMETER_HOME on startup (even more fall-back) add 21128b5 Use less aggressive escaping for JSON Strings in reports error messages add b69ca04 Freestyle format for names in (Default)SamplerCreater add f6d4f52 Remove unsused private field add 414f0e2 Remove empty javadoc add c81d287 Add type argument add ead6b9c Add generic type info add ebb0492 Spacepolice add 9a900cb Correct test cases for new behaviour of report generation add ba2c8ba Update Apache ActiveMQ dependencies to 5.16.0 add 8a7da19 Update Bouncycastle to 1.66 add f9445e8 Update Apache commons-io to 2.7 (from 2.6) add 19ff94a Update Apache commons-lang3 to 3.11 add 1f62fa7 Update Apache commons-net to 3.7 add 11d5bbd Update Apache commons-pool2 to 2.8.1 add acaacb3 Update Apache commons-text to 1.9 add 1ab3021 Update equalsverifier to 3.4.2 add 736d4c2 Update junit5 to 5.6.2 add 79d99fc Update Apache log4j2 to 2.13.3 add dc5360a Update rsyntaxtextarea to 3.1.1 add 06949d1 Try to get more info on flaky test add 459efe1 Merge branch 'master' into bug_64553 No new revisions were added by this update. Summary of changes: .github/workflows/main.yml | 19 ++- README.md | 14 +- bin/jmeter.properties | 8 + build.gradle.kts | 73 +++++---- buildSrc/checksum.xml | 3 + .../subprojects/batchtest/batchtest.gradle.kts | 2 +- checksum.xml | 12 +- config/checkstyle/checkstyle.xml | 10 +- gradle.properties | 37 ++--- gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 2 + gradlew.bat | 22 +-- settings.gradle.kts | 20 ++- src/components/build.gradle.kts | 2 +- .../apache/jmeter/assertions/HTMLAssertion.java | 6 +- .../apache/jmeter/extractor/BoundaryExtractor.java | 35 +++-- .../extractor/json/jsonpath/JSONManager.java | 8 +- src/core/build.gradle.kts | 2 +- .../src/main/java/org/apache/jmeter/JMeter.java | 12 +- .../main/java/org/apache/jmeter/SplashScreen.java | 12 +- .../jmeter/gui/action/HtmlReportGenerator.java | 10 +- .../jmeter/gui/action/LookAndFeelCommand.java | 77 ++++------ .../jmeter/gui/menu/StaticJMeterGUIComponent.java | 3 +- .../jmeter/report/dashboard/JsonizerVisitor.java | 5 +- .../report/processor/ErrorsSummaryConsumer.java | 11 +- .../org/apache/jmeter/util/JsseSSLManager.java | 2 +- .../apache/jmeter/resources/messages.properties | 7 + .../apache/jmeter/resources/messages_fr.properties | 7 + .../processor/ErrorsSummaryConsumerTest.java | 4 +- src/dist-check/build.gradle.kts | 2 +- src/dist/build.gradle.kts | 7 +- src/functions/build.gradle.kts | 2 +- .../src/main/java/org/apache/jmeter/NewDriver.java | 7 +- src/protocol/build.gradle.kts | 7 +- .../protocol/http/config/gui/HttpDefaultsGui.java | 62 +++++--- .../http/control/gui/HttpTestSampleGui.java | 52 ++++--- .../http/proxy/AbstractSamplerCreator.java | 11 +- .../protocol/http/proxy/DefaultSamplerCreator.java | 64 +++++--- .../jmeter/protocol/http/proxy/HttpRequestHdr.java | 12 +- .../apache/jmeter/protocol/http/proxy/Proxy.java | 33 ++++- .../jmeter/protocol/http/proxy/ProxyControl.java | 13 +- .../jmeter/protocol/http/proxy/SamplerCreator.java | 8 + .../protocol/http/proxy/SamplerCreatorFactory.java | 13 ++ .../protocol/http/proxy/gui/ProxyControlGui.java | 163 ++++++++++----------- .../protocol/http/proxy/gui/RecorderDialog.java | 68 +++++---- .../protocol/http/sampler/HTTPSamplerBase.java | 42 +++++- .../http/control/TestCacheManagerBase.java | 6 +- .../protocol/jdbc/AbstractJDBCTestElement.java | 2 +- .../protocol/SynchronousTransportListener.java | 4 +- xdocs/changes.xml | 31 +++- .../http-request-defaults-advanced-tab.png | Bin 9455 -> 19213 bytes .../screenshots/http-request-advanced-tab.png | Bin 6194 -> 18573 bytes xdocs/images/screenshots/proxy_control.png | Bin 9505 -> 20741 bytes xdocs/nightly.xml | 12 +- xdocs/usermanual/component_reference.xml | 33 +++-- xdocs/usermanual/properties_reference.xml | 11 ++ 57 files changed, 683 insertions(+), 411 deletions(-)