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 2023/01/04 15:07:08 UTC
[jmeter] branch master updated (74d9040362 -> 3e424d774b)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
from 74d9040362 added jsonpath string to assertion error message so it is easier to understand the error
new ff1572273e Update jackson to 2.13.4.2 with new gpg key used for signing
new b0284c9999 Update jsoup to 1.15.3 and tika parser to 1.28.5
new 62124ca17d Update Apache commons-net to 3.9.0 and fix changes list
new e1ba582ffa update xstream to 1.4.20 (from 1.4.19)
new 3e424d774b add pr number to changes.xml
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
checksum.xml | 2 +-
gradle.properties | 12 ++++++------
src/dist/src/dist/expected_release_jars.csv | 16 ++++++++--------
xdocs/changes.xml | 8 ++++++++
4 files changed, 23 insertions(+), 15 deletions(-)
[jmeter] 02/05: Update jsoup to 1.15.3 and tika parser to 1.28.5
Posted by 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
commit b0284c99998da4099f39aa3dc106526c717e06ea
Author: Stefan Seide <ac...@seide.st>
AuthorDate: Thu Nov 3 20:12:12 2022 +0100
Update jsoup to 1.15.3 and tika parser to 1.28.5
---
gradle.properties | 4 ++--
src/dist/src/dist/expected_release_jars.csv | 6 +++---
xdocs/changes.xml | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 161383e63c..a8519bd41b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -109,7 +109,7 @@ jmespath-jackson.version=0.5.1
jodd.version=5.0.13
json-path.version=2.7.0
json-smart.version=2.4.8
-jsoup.version=1.15.1
+jsoup.version=1.15.3
jtidy.version=r938
junit4.version=4.13.2
junit5.version=5.8.2
@@ -133,7 +133,7 @@ slf4j.version=1.7.36
spock-core.version=2.2-groovy-3.0
springframework.version=4.3.17.RELEASE
svgSalamander.version=1.1.2.4
-tika.version=1.28.3
+tika.version=1.28.5
xalan.version=2.7.2
xercesImpl.version=2.12.2
xml-apis.version=1.4.01
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 292373756e..beb0ab53f5 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -83,7 +83,7 @@
26047,jodd-props-5.0.13.jar
271159,json-path-2.7.0.jar
119545,json-smart-2.4.8.jar
-429123,jsoup-1.15.1.jar
+438018,jsoup-1.15.3.jar
249924,jtidy-r938.jar
384581,junit-4.13.2.jar
32033,kotlin-logging-jvm-2.0.5.jar
@@ -123,8 +123,8 @@
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
-735701,tika-core-1.28.3.jar
-1587751,tika-parsers-1.28.3.jar
+736051,tika-core-1.28.5.jar
+1588025,tika-parsers-1.28.5.jar
174661,vis-svg-portable-jvm-2.2.1.jar
3154938,xalan-2.7.2.jar
1446149,xercesImpl-2.12.2.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 122d6105e8..46097082a6 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -109,6 +109,8 @@ Summary
Based on a patch by Ori Marko (orimarko at gmail.com)</li>
<li><issue></issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
<li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
+ <li><issue></issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
+ <li><issue></issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
</ul>
<!-- =================== Bug fixes =================== -->
[jmeter] 03/05: Update Apache commons-net to 3.9.0 and fix changes list
Posted by 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
commit 62124ca17d02ddc8fbc15c348dc4b166c857bc46
Author: Stefan Seide <ac...@seide.st>
AuthorDate: Thu Dec 22 12:04:18 2022 +0100
Update Apache commons-net to 3.9.0 and fix changes list
---
checksum.xml | 2 +-
gradle.properties | 2 +-
src/dist/src/dist/expected_release_jars.csv | 2 +-
xdocs/changes.xml | 7 +++++++
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index 7d7cce2df7..a977f79de4 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -7,8 +7,8 @@
<trusted-keys>
<trusted-key id='1c8d5ef0df2b70d4' group='cglib' />
<trusted-key id='379ce192d401ab61' group='com.diffplug.durian' />
- <trusted-key id='8d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
<trusted-key id='3d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
+ <trusted-key id='8d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
<trusted-key id='4c00043bec5cb7cb' group='com.fifesoft' />
<trusted-key id='af10873874630863' group='com.flipkart.zjsonpatch' />
<trusted-key id='379ce192d401ab61' group='com.formdev' />
diff --git a/gradle.properties b/gradle.properties
index a8519bd41b..baaffbd1e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -77,7 +77,7 @@ commons-lang.version=2.6
commons-lang3.version=3.12.0
commons-logging.version=1.2
commons-math3.version=3.6.1
-commons-net.version=3.8.0
+commons-net.version=3.9.0
commons-pool2.version=2.11.1
commons-text.version=1.10.0
darklaf.version=2.7.3
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index beb0ab53f5..4dc7157fda 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -35,7 +35,7 @@
587402,commons-lang3-3.12.0.jar
61829,commons-logging-1.2.jar
2213560,commons-math3-3.6.1.jar
-307305,commons-net-3.8.0.jar
+316431,commons-net-3.9.0.jar
145516,commons-pool2-2.11.1.jar
238400,commons-text-1.10.0.jar
1547509,darklaf-core-2.7.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 46097082a6..845b39f34e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -111,6 +111,13 @@ Summary
<li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
<li><issue></issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
<li><issue></issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
+ <li><issue>5725</issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
+ <li><issue>5725</issue>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
+ <li><issue>5725</issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
+ <li><issue>5725</issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
+ <li><issue>5725</issue>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
+ <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
+ Based on a patch by Ori Marko (orimarko at gmail.com)</li>
</ul>
<!-- =================== Bug fixes =================== -->
[jmeter] 04/05: update xstream to 1.4.20 (from 1.4.19)
Posted by 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
commit e1ba582ffa3862f7d5033eeef71161e313ab0b9a
Author: Stefan Seide <ac...@seide.st>
AuthorDate: Wed Jan 4 10:36:54 2023 +0100
update xstream to 1.4.20 (from 1.4.19)
---
gradle.properties | 2 +-
src/dist/src/dist/expected_release_jars.csv | 2 +-
xdocs/changes.xml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index baaffbd1e7..c250716fd8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -140,5 +140,5 @@ xml-apis.version=1.4.01
xmlgraphics-commons.version=2.7
xmlpull.version=1.1.3.1
xpp3_min.version=1.1.4c
-xstream.version=1.4.19
+xstream.version=1.4.20
wiremock-jre8.version=2.32.0
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 4dc7157fda..7702084ba2 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -134,4 +134,4 @@
7188,xmlpull-1.1.3.1.jar
1027759,xmlresolver-4.2.0-data.jar
150259,xmlresolver-4.2.0.jar
-633140,xstream-1.4.19.jar
+644649,xstream-1.4.20.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 845b39f34e..f314bde430 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -118,6 +118,7 @@ Summary
<li><issue>5725</issue>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
<li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
Based on a patch by Ori Marko (orimarko at gmail.com)</li>
+ <li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
</ul>
<!-- =================== Bug fixes =================== -->
[jmeter] 05/05: add pr number to changes.xml
Posted by 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
commit 3e424d774be166bf1e1c921552ad8457ee6f711d
Author: Stefan Seide <ac...@seide.st>
AuthorDate: Thu Nov 3 20:22:57 2022 +0100
add pr number to changes.xml
Closes #5725
---
xdocs/changes.xml | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f314bde430..3182bd1b0b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -107,17 +107,12 @@ Summary
<li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
<li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
Based on a patch by Ori Marko (orimarko at gmail.com)</li>
- <li><issue></issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
- <li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
- <li><issue></issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
- <li><issue></issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
- <li><issue>5725</issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
- <li><issue>5725</issue>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
- <li><issue>5725</issue>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
- <li><issue>5725</issue>Update JSoup to 1.15.3 (from 1.15.1)</li>
- <li><issue>5725</issue>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
- <li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
- Based on a patch by Ori Marko (orimarko at gmail.com)</li>
+ <li><pr>5718</pr>Update Apache commons-text to 1.10.0 (from 1.9)</li>
+ <li><pr>5725</pr>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
+ <li><pr>5725</pr>Update Jackson Databind to 2.13.4.2 (from 2.13.2.2)</li>
+ <li><pr>5725</pr>Update Tika Parser to 1.28.5 (from 1.28.3)</li>
+ <li><pr>5725</pr>Update JSoup to 1.15.3 (from 1.15.1)</li>
+ <li><pr>5725</pr>Update Apache commons-net to 3.9.0 (from 3.8.0)</li>
<li><pr>5725</pr>Update XStream to 1.4.20 (from 1.4.19)</li>
</ul>
@@ -177,6 +172,7 @@ Summary
</p>
<ul>
<li>Kai Lehmann (klehmann at aservo.com)</li>
+ <li>Stefan Seide (stefan at trilobyte-se.de)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter.</p>
<ul>
[jmeter] 01/05: Update jackson to 2.13.4.2 with new gpg key used for signing
Posted by 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
commit ff1572273ec2dfff463b845c1666a0a3e745803c
Author: Stefan Seide <ac...@seide.st>
AuthorDate: Thu Nov 3 20:11:24 2022 +0100
Update jackson to 2.13.4.2 with new gpg key used for signing
---
checksum.xml | 2 +-
gradle.properties | 4 ++--
src/dist/src/dist/expected_release_jars.csv | 6 +++---
xdocs/changes.xml | 2 ++
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index 9b5bbf4ab2..7d7cce2df7 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -8,7 +8,7 @@
<trusted-key id='1c8d5ef0df2b70d4' group='cglib' />
<trusted-key id='379ce192d401ab61' group='com.diffplug.durian' />
<trusted-key id='8d7f1bec1e2ecae7' group='com.fasterxml.jackson.core' />
- <trusted-key id='c9fbaa83a8753994' group='com.fasterxml.jackson.core' />
+ <trusted-key id='3d12ca2ac19f3181' group='com.fasterxml.jackson.core' />
<trusted-key id='4c00043bec5cb7cb' group='com.fifesoft' />
<trusted-key id='af10873874630863' group='com.flipkart.zjsonpatch' />
<trusted-key id='379ce192d401ab61' group='com.formdev' />
diff --git a/gradle.properties b/gradle.properties
index 4c810271a8..161383e63c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -98,8 +98,8 @@ httpclient.version=4.5.13
httpcore-nio.version=4.4.15
httpcore.version=4.4.15
httpmime.version=4.5.13
-jackson.version=2.13.3
-jackson-databind.version=2.13.2.2
+jackson.version=2.13.4
+jackson-databind.version=2.13.4.2
javax.activation.version=1.2.0
jcharts.version=0.7.5
jdom.version=1.1.3
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index be292924c5..292373756e 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -69,9 +69,9 @@
328324,httpcore-4.4.15.jar
369486,httpcore-nio-4.4.15.jar
41790,httpmime-4.5.13.jar
-75714,jackson-annotations-2.13.3.jar
-374895,jackson-core-2.13.3.jar
-1536542,jackson-databind-2.13.3.jar
+75717,jackson-annotations-2.13.4.jar
+374895,jackson-core-2.13.4.jar
+1531681,jackson-databind-2.13.4.2.jar
78030,javax.activation-1.2.0.jar
142391,jcharts-0.7.5.jar
16555,jcl-over-slf4j-1.7.36.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e05d77416e..122d6105e8 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -107,6 +107,8 @@ Summary
<li><issue>5718</issue>Update Apache commons-text to 1.10.0 (from 1.9)</li>
<li><pr>5731</pr>Update docs for <code>changeCase</code> function. <code>UPPER</code> is the default.
Based on a patch by Ori Marko (orimarko at gmail.com)</li>
+ <li><issue></issue>Update Jackson Core to 2.13.4 (from 2.13.2)</li>
+ <li><issue></issue>Update Jackson Databind to 2.13.4.2 (from 2.13.4.2)</li>
</ul>
<!-- =================== Bug fixes =================== -->