[jmeter] branch master updated (b914b71364 -> 0327a256c5)

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


    from b914b71364 Correct theme for darklaf on rsyntaxtextarea
     new cc98da3914 Correct markup
     new 0327a256c5 Only bug fixes for now, so set next version to 5.5.1

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

[jmeter] 02/02: Only bug fixes for now, so set next version to 5.5.1

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 0327a256c591f8bea36eddbfe692ef65af0883e1
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Thu Jul 7 17:27:50 2022 +0200

    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 94d3f4c0e8..874c65a520 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 a1d8771a71..65147fb68d 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>

[jmeter] 01/02: Correct markup

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit cc98da39143caa456126a4787c199623f95f2ec3
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Thu Jul 7 17:26:33 2022 +0200

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

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 84bb8e3ce4..a1d8771a71 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 =================== -->