[jmeter] branch master updated: Update XStream to 1.4.14 (from 1.4.14.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


The following commit(s) were added to refs/heads/master by this push:
     new 85d065e  Update XStream to 1.4.14 (from 1.4.14.1)
85d065e is described below

commit 85d065eff1614e3ad05336f7cf83cd9bc6957bca
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Tue Nov 17 11:55:05 2020 +0100

    Update XStream to 1.4.14 (from 1.4.14.1)
---
 gradle.properties | 2 +-
 xdocs/changes.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a0086d5..7293626 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -130,5 +130,5 @@ xml-apis.version=1.4.01
 xmlgraphics-commons.version=2.3
 xmlpull.version=1.1.3.1
 xpp3_min.version=1.1.4c
-xstream.version=1.4.11.1
+xstream.version=1.4.14
 wiremock-jre8.version=2.24.1
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 983131b..ed9bb00 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -157,6 +157,7 @@ applications when JMeter is starting up.</p>
     <li>Update rsyntaxtextarea to 3.1.1 (from 3.1.0)</li>
     <li>Update JUnit5 to 5.7.0 (from 5.6.2)</li>
     <li>Update Rhino to 1.7.13 (from 1.7.12)</li>
+    <li>Update XStream to 1.4.14 (from 1.4.14.1)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->