This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 efe50ca update tika-parsers to 1.28.1 (from 1.28) and xstreams to
1.4.19 (from 1.4.18) (#698)
efe50ca is described below
commit efe50ca5b150cdbdb578886f8b4d98d3f1ea264f
Author: sseide <account-git...@seide.st>
AuthorDate: Wed Feb 16 13:39:36 2022 +0100
update tika-parsers to 1.28.1 (from 1.28) and xstreams to 1.4.19 (from
1.4.18) (#698)
* update tika-parsers to 1.28.1 (from 1.28) and xstreams to 1.4.19 (from
1.4.18)
* update xercesImpl to 2.12.2 (from 2.12.1) and add new gpg key from xerces
maintainer (ref XERCESJ-1735)
* add pr number to changes.xml
* update expected_release_jars.csv
---
checksum.xml | 1 +
gradle.properties | 6 +++---
src/dist/src/dist/expected_release_jars.csv | 8 ++++----
xdocs/changes.xml | 7 +++----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index c335c72..c860213 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -198,6 +198,7 @@
<trusted-key id='a2115ae15f6b8b72' group='org.xmlunit' />
<trusted-key id='9ff25980f5ba7e4f' group='xalan' />
<trusted-key id='858fc4c4f43856a3' group='xerces' />
+ <trusted-key id='7d713008cc07e9ad' group='xerces' />
<trusted-key id='86fdc7e2a11262cb' group='xml-apis' />
</trusted-keys>
<dependencies>
diff --git a/gradle.properties b/gradle.properties
index 23207fd..376c329 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -132,12 +132,12 @@ slf4j.version=1.7.32
spock-core.version=2.0-M2-groovy-3.0
springframework.version=4.3.17.RELEASE
svgSalamander.version=1.1.2.4
-tika.version=1.28
+tika.version=1.28.1
xalan.version=2.7.2
-xercesImpl.version=2.12.1
+xercesImpl.version=2.12.2
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.18
+xstream.version=1.4.19
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 a43c8d3..9caa9b8 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -121,13 +121,13 @@
301279,svgSalamander-1.1.2.4.jar
10192,swing-extensions-laf-support-0.1.3.jar
2539,swing-extensions-visual-padding-0.1.3.jar
-735635,tika-core-1.28.jar
-1585374,tika-parsers-1.28.jar
+735645,tika-core-1.28.1.jar
+1585382,tika-parsers-1.28.1.jar
174661,vis-svg-portable-jvm-2.2.1.jar
3154938,xalan-2.7.2.jar
-1386502,xercesImpl-2.12.1.jar
+1446149,xercesImpl-2.12.2.jar
220536,xml-apis-1.4.01.jar
85686,xml-apis-ext-1.3.04.jar
674607,xmlgraphics-commons-2.6.jar
7188,xmlpull-1.1.3.1.jar
-629707,xstream-1.4.18.jar
+633140,xstream-1.4.19.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ced05b1..44a09ce 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -152,7 +152,7 @@ however, the profile can't be updated while the test is
running.
<li>Added Kotlin 1.6.0 for JMeter engine implementation (apiVersion=1.5).
The set of JSR 223 languages is intact.</li>
<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><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>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to
1.4.19 (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>
@@ -185,7 +185,7 @@ however, the profile can't be updated while the test is
running.
<li>Updated RSyntaxTextArea to 3.1.3 (from 3.1.1).</li>
<li>Updated SLF4J to 1.7.32 (from 1.7.30).</li>
<li>Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1).</li>
- <li>Updated Apache Tika to 1.28 (from 1.26).</li>
+ <li><pr>698</pr>Updated Apache Tika to 1.28.1 (from 1.26).</li>
<li>Updated WireMock-JRE8 to 2.30.0 (from 2.24.1).</li>
<li>Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74).</li>
<li>Updated jackson to 2.13.1 (from 2.10.5)</li>
@@ -263,10 +263,9 @@ however, the profile can't be updated while the test is
running.
<h3>General</h3>
<ul>
<li><bug>64318</bug>DNS Cache Manager - custom DNS resolver does not use
system resolver by default</li>
- <li><pr>641</pr>Updated xercesImpl to 2.12.1 (from 2.12.0). Based on patch
by Stefan Seide (stefan at trilobyte-se.de).</li>
+ <li><pr>641</pr><pr>698</pr>Updated xercesImpl to 2.12.2 (from 2.12.0).
Based on patch by Stefan Seide (stefan at trilobyte-se.de).</li>
<li><pr>645</pr>Add escaping for new lines in
<code>AbstractInfluxdbMetricsSender</code>. Contributed by David Getzlaff
(david.getzlaff at t-systems.com>)</li>
<li><bug>65198</bug>Can't copy generated function from FunctionHelper</li>
- <li>Updated Apache Tika to 1.26 (from 1.24.1)</li>
<li><pr>658</pr>Improve javadoc. Contributed by Ori Marko (orimarko at
gmail.com)</li>
<li><pr>661</pr>Fix wording in doc. Contributed by BugKing (wangzhen at
fit2cloud.com)</li>
<li><pr>664</pr>Allow whitespace in path. Contributed by Till Neunast
(github.com/tilln)</li>
