[jmeter] branch master updated: Update to jackson 2.10.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 a2051bf  Update to jackson 2.10.1
a2051bf is described below

commit a2051bf7b0d407495800aeb895f0896a3f2fa348
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Tue Dec 3 19:09:22 2019 +0100

    Update to jackson 2.10.1
    
    Originally Stefan Seide proposed to update jackson databind to 2.9.10.1,
    but as jackson seems to have moved on to 2.10.x as the current major
    release, it is probably better to update to the current newest major version.
    
    Squashed commit of the following:
    
    commit b7d433cbee608b6d903424cca566c76282da15ea
    Author: Felix Schumacher <fe...@internetallee.de>
    Date:   Tue Dec 3 19:05:45 2019 +0100
    
        Update to jackson 2.10.1
    
    commit dd42b999efab2a29c7dbe2d613c3d21c6556f8df
    Author: Stefan Seide <ac...@seide.st>
    Date:   Tue Nov 26 13:01:30 2019 +0100
    
        update jackson dependency to 2.9.10.1
    
    Closes #546
    Bugzilla Id: 63963
---
 gradle.properties | 4 ++--
 xdocs/changes.xml | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ac8968b..a4a8570 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -83,8 +83,8 @@ httpclient.version=4.5.10
 httpcore-nio.version=4.4.12
 httpcore.version=4.4.12
 httpmime.version=4.5.10
-jackson.version=2.9.10
-jackson-databind.version=2.9.10
+jackson.version=2.10.1
+jackson-databind.version=2.10.1
 javax.activation.version=1.2.0
 jcharts.version=0.7.5
 jdom.version=1.1.3
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 2c59925..a2d67e0 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -118,6 +118,7 @@ to view the last release notes of version 5.2.1.
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
+    <li><bug>63963</bug><pr>546</pr>Updated jackson to 2.10.1 (from 2.9.10)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
@@ -171,6 +172,7 @@ to view the last release notes of version 5.2.1.
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
+  <li>Stefan Seide (stefan at trilobyte-se.de)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>