Skip to content

Commit 8784d3b

Browse files
committed
doc: update the next version to be 5.6
1 parent ebc1615 commit 8784d3b

5 files changed

Lines changed: 95 additions & 67 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ kotlin.code.style=official
3131
# This is version for Apache JMeter itself
3232
# Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
3333
# Release version can be generated by using -Prelease or -Prc=<int> arguments
34-
jmeter.version=5.5.1
34+
jmeter.version=5.6
3535

3636
# Plugins
3737
com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661

src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public void runTest() throws JMeterEngineException {
214214
}
215215
}
216216

217-
@API(status = API.Status.EXPERIMENTAL, since = "5.5.1")
217+
@API(status = API.Status.EXPERIMENTAL, since = "5.6")
218218
public void awaitTermination(Duration duration) throws ExecutionException, InterruptedException, TimeoutException {
219219
runningTest.get(duration.toMillis(), TimeUnit.MILLISECONDS);
220220
}

src/dist/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ val verifyReleaseDependencies by tasks.registering {
171171
dependsOn(configurations.runtimeClasspath)
172172
val expectedLibs = file("src/dist/expected_release_jars.csv")
173173
inputs.file(expectedLibs)
174+
inputs.property("updateExpectedJars", updateExpectedJars)
174175
val actualLibs = File(buildDir, "dist/expected_release_jars.csv")
175176
outputs.file(actualLibs)
176177
doLast {
Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
29524,accessors-smart-2.4.8.jar
2-
29371,annotations-23.0.0.jar
1+
29904,accessors-smart-2.4.11.jar
2+
30651,annotations-24.0.1.jar
33
6806,apiguardian-api-1.1.2.jar
4-
122176,asm-9.3.jar
5-
582079,base-portable-jvm-3.1.0.jar
4+
121863,asm-9.5.jar
5+
582588,base-portable-jvm-3.2.0.jar
66
485898,batik-anim-1.16.jar
77
424607,batik-awt-util-1.16.jar
88
704905,batik-bridge-1.16.jar
@@ -29,7 +29,7 @@
2929
588337,commons-collections-3.2.2.jar
3030
751914,commons-collections4-4.4.jar
3131
211301,commons-dbcp2-2.9.0.jar
32-
327135,commons-io-2.11.0.jar
32+
474305,commons-io-2.12.0.jar
3333
267634,commons-jexl-2.1.1.jar
3434
462124,commons-jexl3-3.2.1.jar
3535
587402,commons-lang3-3.12.0.jar
@@ -50,28 +50,31 @@
5050
98115,dec-0.1.2.jar
5151
320748,dnsjava-2.1.9.jar
5252
15992,error_prone_annotations-2.10.0.jar
53-
1715750,freemarker-2.3.31.jar
53+
1736381,freemarker-2.3.32.jar
5454
32359,geronimo-jms_1.1_spec-1.1.1.jar
55-
8023771,groovy-3.0.11.jar
56-
19460,groovy-datetime-3.0.11.jar
57-
11688,groovy-dateutil-3.0.11.jar
58-
137554,groovy-jmx-3.0.11.jar
59-
133032,groovy-json-3.0.11.jar
60-
21298,groovy-jsr223-3.0.11.jar
61-
83198,groovy-sql-3.0.11.jar
62-
98476,groovy-templates-3.0.11.jar
63-
296089,groovy-xml-3.0.11.jar
55+
8038657,groovy-3.0.17.jar
56+
15178,groovy-datetime-3.0.17.jar
57+
7405,groovy-dateutil-3.0.17.jar
58+
132953,groovy-jmx-3.0.17.jar
59+
128879,groovy-json-3.0.17.jar
60+
16838,groovy-jsr223-3.0.17.jar
61+
78915,groovy-sql-3.0.17.jar
62+
94160,groovy-templates-3.0.17.jar
63+
291717,groovy-xml-3.0.17.jar
6464
123360,hamcrest-2.2.jar
6565
1499,hamcrest-core-2.2.jar
6666
109741,hamcrest-date-2.0.8.jar
6767
181512,httpasyncclient-4.1.5.jar
68-
780321,httpclient-4.5.13.jar
69-
328324,httpcore-4.4.15.jar
70-
369486,httpcore-nio-4.4.15.jar
71-
41790,httpmime-4.5.13.jar
72-
75717,jackson-annotations-2.13.4.jar
73-
374895,jackson-core-2.13.4.jar
74-
1531681,jackson-databind-2.13.4.2.jar
68+
785639,httpclient-4.5.14.jar
69+
797934,httpclient5-5.1.3.jar
70+
327891,httpcore-4.4.16.jar
71+
368896,httpcore-nio-4.4.16.jar
72+
850808,httpcore5-5.1.3.jar
73+
232137,httpcore5-h2-5.1.3.jar
74+
41727,httpmime-4.5.14.jar
75+
75564,jackson-annotations-2.15.1.jar
76+
546100,jackson-core-2.15.1.jar
77+
1620059,jackson-databind-2.15.1.jar
7578
78030,javax.activation-1.2.0.jar
7679
142391,jcharts-0.7.5.jar
7780
16555,jcl-over-slf4j-1.7.36.jar
@@ -81,57 +84,57 @@
8184
220475,jodd-lagarto-5.0.13.jar
8285
19858,jodd-log-5.0.13.jar
8386
26047,jodd-props-5.0.13.jar
84-
271159,json-path-2.7.0.jar
85-
119545,json-smart-2.4.8.jar
86-
438018,jsoup-1.15.3.jar
87+
277582,json-path-2.8.0.jar
88+
120205,json-smart-2.4.11.jar
89+
443295,jsoup-1.16.1.jar
8790
249924,jtidy-r938.jar
8891
384581,junit-4.13.2.jar
8992
32033,kotlin-logging-jvm-2.0.5.jar
9093
1670468,kotlin-stdlib-1.8.21.jar
9194
221490,kotlin-stdlib-common-1.8.21.jar
9295
963,kotlin-stdlib-jdk7-1.8.21.jar
9396
968,kotlin-stdlib-jdk8-1.8.21.jar
94-
1492143,kotlinx-coroutines-core-jvm-1.6.1.jar
95-
10026,kotlinx-coroutines-swing-1.6.1.jar
97+
1548432,kotlinx-coroutines-core-jvm-1.7.1.jar
98+
9964,kotlinx-coroutines-swing-1.7.1.jar
9699
792176,kotlinx-html-jvm-0.7.3.jar
97-
185204,lets-plot-batik-3.1.0.jar
98-
4819710,lets-plot-common-3.1.0.jar
99-
303443,log4j-1.2-api-2.17.2.jar
100-
302511,log4j-api-2.17.2.jar
101-
1811089,log4j-core-2.17.2.jar
102-
24248,log4j-slf4j-impl-2.17.2.jar
100+
199113,lets-plot-batik-3.2.0.jar
101+
4918373,lets-plot-common-3.2.0.jar
102+
344375,log4j-1.2-api-2.20.0.jar
103+
313296,log4j-api-2.20.0.jar
104+
1847550,log4j-core-2.20.0.jar
105+
23862,log4j-slf4j-impl-2.20.0.jar
103106
519087,mail-1.5.0-b01.jar
104107
106949,miglayout-core-5.3.jar
105108
22576,miglayout-swing-5.3.jar
106109
419054,mongo-java-driver-2.11.3.jar
107110
29680,mxparser-1.2.2.jar
108-
4888362,neo4j-java-driver-4.4.6.jar
111+
5052937,neo4j-java-driver-4.4.11.jar
109112
65261,oro-2.0.8.jar
110-
1308773,ph-commons-10.1.6.jar
113+
1314577,ph-commons-10.2.4.jar
111114
530791,ph-css-6.5.0.jar
112-
1235840,plot-api-jvm-4.3.0.jar
113-
1138257,plot-base-portable-jvm-3.1.0.jar
114-
1065661,plot-builder-portable-jvm-3.1.0.jar
115-
206691,plot-common-portable-jvm-3.1.0.jar
116-
893288,plot-config-portable-jvm-3.1.0.jar
117-
11369,reactive-streams-1.0.3.jar
115+
1256127,plot-api-jvm-4.4.1.jar
116+
1169629,plot-base-portable-jvm-3.2.0.jar
117+
1096918,plot-builder-portable-jvm-3.2.0.jar
118+
206691,plot-common-portable-jvm-3.2.0.jar
119+
923713,plot-config-portable-jvm-3.2.0.jar
120+
11640,reactive-streams-1.0.4.jar
118121
1383644,rhino-1.7.14.jar
119-
1248250,rsyntaxtextarea-3.2.0.jar
120-
5111311,Saxon-HE-11.3.jar
121-
276420,serializer-2.7.2.jar
122+
1297243,rsyntaxtextarea-3.3.3.jar
123+
5098540,Saxon-HE-11.5.jar
124+
283536,serializer-2.7.3.jar
122125
41125,slf4j-api-1.7.36.jar
123-
301279,svgSalamander-1.1.2.4.jar
126+
320794,svgSalamander-1.1.4.jar
124127
10192,swing-extensions-laf-support-0.1.3.jar
125128
2539,swing-extensions-visual-padding-0.1.3.jar
126129
736051,tika-core-1.28.5.jar
127130
1588025,tika-parsers-1.28.5.jar
128-
182638,vis-svg-portable-jvm-3.1.0.jar
129-
3154938,xalan-2.7.2.jar
131+
183438,vis-svg-portable-jvm-3.2.0.jar
132+
3455761,xalan-2.7.3.jar
130133
1446149,xercesImpl-2.12.2.jar
131134
220536,xml-apis-1.4.01.jar
132135
85686,xml-apis-ext-1.3.04.jar
133-
675889,xmlgraphics-commons-2.7.jar
136+
676840,xmlgraphics-commons-2.8.jar
134137
7188,xmlpull-1.1.3.1.jar
135-
1027759,xmlresolver-4.2.0-data.jar
136-
150259,xmlresolver-4.2.0.jar
138+
1027769,xmlresolver-4.6.4-data.jar
139+
157695,xmlresolver-4.6.4.jar
137140
644649,xstream-1.4.20.jar

xdocs/changes.xml

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ Earlier changes are detailed in the <a href="changes_history.html">History of Pr
4646
</note>
4747

4848

49-
<!-- =================== 5.5.1 =================== -->
49+
<!-- =================== 5.6 =================== -->
5050

51-
<h1>Version 5.5.1</h1>
51+
<h1>Version 5.6</h1>
5252
<p>
5353
Summary
5454
</p>
@@ -123,21 +123,39 @@ Summary
123123
<li><pr>725</pr>Add Chinese Simplified Translation for Open Model Thread Group</li>
124124
<li><pr>5710</pr>Add GitHub Issue templates</li>
125125
<li><pr>5910</pr>Use Caffeine for caching customizers in TestBeanGUI instead of commons-collections4 LRUMap</li>
126-
<li><pr>5713</pr>Update Spock to 2.2-groovy-3.0 (from 2.1-groovy-3.0)</li>
126+
<li><pr>5713</pr>Update Spock to 2.3-groovy-3.0 (from 2.1-groovy-3.0)</li>
127127
<li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
128128
<li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
129129
Based on a patch by Ori Marko (orimarko at gmail.com)</li>
130130
<li><pr>5718</pr>Update Apache commons-text to 1.10.0 (from 1.9)</li>
131-
<li><pr>5725</pr>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
132-
<li><pr>5725</pr>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
131+
<li>Update Apache commons-io to 2.12.0 (from 2.11.0)</li>
132+
<li>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
133+
<li><pr>5725</pr>Update Jackson Core to 2.15.1 (from 2.13.3)</li>
134+
<li><pr>5725</pr>Update Jackson Databind to 2.15.1 (from 2.13.3)</li>
133135
<li><pr>5725</pr>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
134-
<li><pr>5725</pr>Update JSoup to 1.15.3 (from 1.15.1)</li>
136+
<li><pr>5725</pr>Update JSoup to 1.16.1 (from 1.15.1)</li>
135137
<li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
136138
<li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
137139
<li><pr>5763</pr>Updated Gradle to 8.1.1 (from 7.2)</li>
138-
<li><pr>5763</pr>Updated Gradle to 7.3 (from 7.2)</li>
139140
<li>Update lets-plot-jvm to 4.3.0 (from 3.1.1)</li>
140-
<li>Update lets-plot-batik to 3.1.0 (from 2.1.1)</li>
141+
<li>Update lets-plot-batik to 3.2.0 (from 2.1.1)</li>
142+
<li>Update accessors-smart to 2.4.11 (from 2.4.8)</li>
143+
<li>Update json-smart to 2.4.11 (from 2.4.8)</li>
144+
<li>Update org.jetbrains:annotations to 24.0.1 (from 23.0.0)</li>
145+
<li>Update asm to 9.5 (from 9.3)</li>
146+
<li>Update Apache Freemarker to 2.3.32 (from 2.3.31)</li>
147+
<li>Update Apache Groovy to 3.0.17 (from 3.0.11)</li>
148+
<li>Update Apache Httpclient to 4.5.14 (from 4.5.13)</li>
149+
<li>Added Apache Httpclient5 5.1.3</li>
150+
<li>Update kotlin-stdlib to 1.8.21 (from 1.6.21)</li>
151+
<li>Update kotlinx-coroutines-core to 1.8.21 (from 1.6.21)</li>
152+
<li>Update kotlinx-coroutines-swing to 1.8.21 (from 1.6.21)</li>
153+
<li>Update log4j-1.2-api to 2.20.0 (from 2.17.2)</li>
154+
<li>Update log4j-api to 2.20.0 (from 2.17.2)</li>
155+
<li>Update log4j-core to 2.20.0 (from 2.17.2)</li>
156+
<li>Update log4j-slf4j-impl to 2.20.0 (from 2.17.2)</li>
157+
<li>Update neo4j-java-driver to 4.4.11 (from 4.4.6)</li>
158+
<li>Update Apache Xalan to 2.7.3 (from 2.7.2)</li>
141159
<li>Added randomized test GitHub Actions matrix for better coverage of locales and time zones</li>
142160
</ul>
143161

@@ -208,12 +226,18 @@ Summary
208226
<p>We thank all contributors mentioned in bug and improvement sections above:
209227
</p>
210228
<ul>
229+
<li>Arnout Engelen (raboof at github)</li>
230+
<li>Clay Johnson (clayburn at github)</li>
231+
<li>David Getzlaff (dgetzlaf at github)</li>
211232
<li>Kai Lehmann (klehmann at aservo.com)</li>
233+
<li>Mohamed Ibrahim (rollno748 at github)</li>
212234
<li>Ori Marko (orimarko at gmail.com)</li>
235+
<li>PJ Fanning (pjfanning at github)</li>
236+
<li>Sandra Thieme (sandra-thieme at github)</li>
213237
<li>Stefan Seide (stefan at trilobyte-se.de)</li>
214-
<li>andreaslind01 Lind (andreaslind01 at gmail.com)</li>
215238
<li>Victor Peralta (vperaltac at github)</li>
216-
<li>Mohamed Ibrahim (rollno748 at github)</li>
239+
<li>andreaslind01 Lind (andreaslind01 at gmail.com)</li>
240+
<li>kaola89 (kaola89 at github)</li>
217241
</ul>
218242
<p>We also thank bug reporters who helped us improve JMeter.</p>
219243
<ul>
@@ -302,11 +326,11 @@ With Java 15 the JavaScript implementation <a href="https://openjdk.java.net/jep
302326
mkdir lib/modules
303327
pushd lib/modules
304328
wget https://repo1.maven.org/maven2/org/openjdk/nashorn/nashorn-core/15.3/nashorn-core-15.3.jar
305-
wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.jar
306-
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar
307-
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.2/asm-util-9.2.jar
308-
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar
309-
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar
329+
wget https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar
330+
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar
331+
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5/asm-util-9.5.jar
332+
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar
333+
wget https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5/asm-analysis-9.5.jar
310334
popd
311335
export JVM_ARGS="--module-path $PWD/lib/modules"
312336
./bin/jmeter

0 commit comments

Comments
 (0)