Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: update the next version to be 5.6 #5936

Merged
merged 1 commit into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions src/dist/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
84 changes: 57 additions & 27 deletions xdocs/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down