You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2021/10/26 18:25:18 UTC
[jmeter] branch master updated: Update x-stream to 1.4.18 (from
1.4.17)
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
The following commit(s) were added to refs/heads/master by this push:
new 3c23246 Update x-stream to 1.4.18 (from 1.4.17)
3c23246 is described below
commit 3c23246558a56e751f3e4fd860f46a2440893fa8
Author: Stefan Seide <ac...@seide.st>
AuthorDate: Thu Oct 21 12:39:26 2021 +0200
Update x-stream to 1.4.18 (from 1.4.17)
Closes #675
---
gradle.properties | 2 +-
src/dist/src/dist/expected_release_jars.csv | 4 ++--
xdocs/changes.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index e82385e..4690805 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -131,5 +131,5 @@ xml-apis.version=1.4.01
xmlgraphics-commons.version=2.6
xmlpull.version=1.1.3.1
xpp3_min.version=1.1.4c
-xstream.version=1.4.17
+xstream.version=1.4.18
wiremock-jre8.version=2.30.0
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 28ad34e..d931ad0 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -75,7 +75,7 @@
106949,miglayout-core-5.3.jar
22576,miglayout-swing-5.3.jar
419054,mongo-java-driver-2.11.3.jar
-29631,mxparser-1.2.1.jar
+29680,mxparser-1.2.2.jar
4687205,neo4j-java-driver-4.3.3.jar
65261,oro-2.0.8.jar
1307434,ph-commons-10.1.2.jar
@@ -96,4 +96,4 @@
220536,xml-apis-1.4.01.jar
674607,xmlgraphics-commons-2.6.jar
7188,xmlpull-1.1.3.1.jar
-629806,xstream-1.4.17.jar
+629707,xstream-1.4.18.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 267e52c..0e6f832 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -137,7 +137,7 @@ Summary
<ul>
<li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
<li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
- <li><pr>655</pr><pr>667</pr>Updated x-stream to 1.4.17 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
+ <li><pr>655</pr><pr>667</pr><pr>675</pr>Updated x-stream to 1.4.18 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
<li><pr>656</pr><pr>668</pr>Updated json-smart to 2.4.7 (from 2.3), accessors-smart to 2.4.7 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
<li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
<li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>