This is an automated email from the ASF dual-hosted git repository.
milamber pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/jmeter-site-preview.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new 296a740 Update preview for Apache JMeter v5.6.1-rc2
296a740 is described below
commit 296a7409d3b64fbc48d0c8efea3139c3b40bdffc
Author: Milamber <[email protected]>
AuthorDate: Tue Jul 4 11:08:09 2023 +0100
Update preview for Apache JMeter v5.6.1-rc2
---
rat/index.html | 5 +++--
rat/rat-report.txt | 7 ++++---
.../org/apache/jmeter/samplers/SampleResult.html | 2 +-
site/changes.html | 24 ++++++++++++++++++++++
site/usermanual/properties_reference.html | 3 +--
5 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/rat/index.html b/rat/index.html
index eb02335..4cd1635 100644
--- a/rat/index.html
+++ b/rat/index.html
@@ -39,10 +39,10 @@ caption {color:blue;text-align:left;}
Table 1: A snapshot summary of this rat report.
</caption>
<tr>
-<td colspan="1" class="notes">Notes: 35</td><td colspan="1"
class="binaries">Binaries: 10</td><td colspan="1" class="archives">Archives:
3</td><td colspan="1" class="standards">Standards: 1991</td>
+<td colspan="1" class="notes">Notes: 35</td><td colspan="1"
class="binaries">Binaries: 10</td><td colspan="1" class="archives">Archives:
3</td><td colspan="1" class="standards">Standards: 1992</td>
</tr>
<tr>
-<td colspan="2" class="licenced">Apache Licensed: 1991</td><td colspan="2"
class="generated">Generated Documents: 0</td>
+<td colspan="2" class="licenced">Apache Licensed: 1992</td><td colspan="2"
class="generated">Generated Documents: 0</td>
</tr>
<tr>
<td colspan="2" class="java_note">Note: JavaDocs are generated and so license
header is optional</td><td colspan="2" class="generated_note">Note: Generated
files do not require license headers</td>
@@ -219,6 +219,7 @@ Table 1: A snapshot summary of this rat report.
AL
/src/dist-check/src/test/groovy/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy<br>
AL
/src/dist-check/src/test/groovy/org/apache/jmeter/gui/util/MenuFactorySpec.groovy<br>
AL
/src/dist-check/src/test/groovy/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy<br>
+ AL
/src/dist-check/src/test/kotlin/org/apache/jmeter/loadsave/IsEnabledNormalizer.kt<br>
AL
/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java<br>
AL
/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java<br>
AL
/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java<br>
diff --git a/rat/rat-report.txt b/rat/rat-report.txt
index 78502c7..96a7606 100644
--- a/rat/rat-report.txt
+++ b/rat/rat-report.txt
@@ -2,14 +2,14 @@
*****************************************************
Summary
-------
-Generated at: 2023-06-29T16:52:29+01:00
+Generated at: 2023-07-04T11:03:39+01:00
Notes: 35
Binaries: 10
Archives: 3
-Standards: 1991
+Standards: 1992
-Apache Licensed: 1991
+Apache Licensed: 1992
Generated Documents: 0
JavaDocs are generated, thus a license header is optional.
@@ -184,6 +184,7 @@ Archives:
AL
/src/dist-check/src/test/groovy/org/apache/jmeter/report/dashboard/ReportGeneratorSpec.groovy
AL
/src/dist-check/src/test/groovy/org/apache/jmeter/gui/util/MenuFactorySpec.groovy
AL
/src/dist-check/src/test/groovy/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy
+ AL
/src/dist-check/src/test/kotlin/org/apache/jmeter/loadsave/IsEnabledNormalizer.kt
AL
/src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
AL
/src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
AL
/src/dist-check/src/test/java/org/apache/jmeter/save/TestSaveService.java
diff --git a/site/api/org/apache/jmeter/samplers/SampleResult.html
b/site/api/org/apache/jmeter/samplers/SampleResult.html
index 8b3276a..7fa40c8 100644
--- a/site/api/org/apache/jmeter/samplers/SampleResult.html
+++ b/site/api/org/apache/jmeter/samplers/SampleResult.html
@@ -747,7 +747,7 @@ implements <a
href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base
<div class="member-signature"><span class="modifiers">protected static
final</span> <span class="return-type"><a
href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/String.html";
title="class or interface in java.lang"
class="external-link">String</a></span> <span
class="element-name">DEFAULT_ENCODING</span></div>
<div class="block">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.</div>
+ with a default of <a
href="#DEFAULT_HTTP_ENCODING"><code>DEFAULT_HTTP_ENCODING</code></a> if that is
not defined.</div>
</section>
</li>
<li>
diff --git a/site/changes.html b/site/changes.html
index b7a6c17..73ad752 100644
--- a/site/changes.html
+++ b/site/changes.html
@@ -201,6 +201,18 @@ Earlier changes are detailed in the <a
href="changes_history.html">History of Pr
<div class="clear"></div>
+<br>
+
+<div class="clear"></div>
+<div class="note">
+JMeter 5.6.1 requires Java 8 or later for execution (Java 17 or later
recommended).
+<br>
+
+<b>The next major release would require Java 11 or later.</b>
+
+</div>
+<div class="clear"></div>
+
@@ -299,6 +311,18 @@ Summary
</ul>
+
+<h3>Other Samplers</h3>
+
+<ul>
+
+<li>
+<a href="https://github.com/apache/jmeter/pull/6028";>
+ PR#6028</a>, Change default value for <span
class="code">sampleresult.default.encoding</span> to UTF-8 (it inherits default
HTTP encoding which was modified in <a
href="https://github.com/apache/jmeter/pull/6010";>
+ PR#6010</a>)</li>
+
+</ul>
+
diff --git a/site/usermanual/properties_reference.html
b/site/usermanual/properties_reference.html
index ef135ab..d885149 100644
--- a/site/usermanual/properties_reference.html
+++ b/site/usermanual/properties_reference.html
@@ -4231,8 +4231,7 @@ JMETER-SERVER</pre>
<div class="name req-true">sampleresult.default.encoding</div>
<div class="description req-true">
The encoding to be used if none is provided.<br>
- Defaults to: <span class="code">ISO-8859-1</span>
-
+ Defaults to: <span class="code">UTF-8</span> (since 5.6.1)
</div>
<div class="required req-true">
No
