jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject [jmeter] branch master updated: update x-stream to 1.4.16 (from 1.4.15)
Date Sat, 10 Apr 2021 11:57:08 GMT
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 18d0a5c  update x-stream to 1.4.16 (from 1.4.15)
18d0a5c is described below

commit 18d0a5cc1e572dd01ce522f0df68263b947d9e18
Author: Stefan Seide <account-github@seide.st>
AuthorDate: Tue Apr 6 18:44:29 2021 +0200

    update x-stream to 1.4.16 (from 1.4.15)
    
    Closes #655
---
 checksum.xml                                | 7 ++++---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 4 ++--
 xdocs/changes.xml                           | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 52db412..c5d6a54 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -71,6 +71,7 @@
     <trusted-key id='379ce192d401ab61' group='info.picocli' />
     <trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
     <trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
+    <trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
     <trusted-key id='6425559c47cc79c4' group='javax.activation' />
     <trusted-key id='6425559c47cc79c4' group='javax.mail' />
     <trusted-key id='6425559c47cc79c4' group='javax.servlet' />
@@ -271,12 +272,12 @@
     <dependency group='oro' module='oro' version='2.0.8'>
       <sha512>9A98E493C4D771322B1331EC05AB0E363A83D8AC2AF8018D96A44DF2BF5BFC97D33EBE6F6F93E46AB10BF1536F0C29E9D9569318ED49BC18B4E96B1A8B476D37</sha512>
     </dependency>
-    <dependency group='xerces' module='xercesImpl' version='2.9.1'>
-      <sha512>37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435</sha512>
-    </dependency>
     <dependency group='xerces' module='xercesImpl' version='2.12.1'>
       <sha512>811AFD85CDD19545785FDE7FB39511F1E171E1D021A96117D105E2B2F37715536E17259E6AD0CE897B4C7C8A5BD1E88C9FA0825B0A2EF9F3956CD82944A33957</sha512>
     </dependency>
+    <dependency group='xerces' module='xercesImpl' version='2.9.1'>
+      <sha512>37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435</sha512>
+    </dependency>
     <dependency group='xml-resolver' module='xml-resolver' version='1.2'>
       <sha512>ECA19B8A6B04C279B7982B16F1763CA1D49B0081A8D4CA2B7419F057D22A0EC60795EB4D901C5EB25DD4A733248876AA2F522C17A6144A26C8EDE9FB2F84531A</sha512>
     </dependency>
diff --git a/gradle.properties b/gradle.properties
index 1ad2c28..5f37e93 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.15
+xstream.version=1.4.16
 wiremock-jre8.version=2.24.1
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index ef756e9..e124b8c 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -76,6 +76,7 @@
 106939,miglayout-core-5.2.jar
 22390,miglayout-swing-5.2.jar
 419054,mongo-java-driver-2.11.3.jar
+29631,mxparser-1.2.1.jar
 4580832,neo4j-java-driver-4.2.0.jar
 65261,oro-2.0.8.jar
 1302550,ph-commons-9.5.1.jar
@@ -94,5 +95,4 @@
 220536,xml-apis-1.4.01.jar
 674607,xmlgraphics-commons-2.6.jar
 7188,xmlpull-1.1.3.1.jar
-24956,xpp3_min-1.1.4c.jar
-627848,xstream-1.4.15.jar
+629686,xstream-1.4.16.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index bcb5939..2302769 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -127,6 +127,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 @ trilobyte.se.de)</li>
+  <li><pr>655</pr>Updated x-stream to 1.4.16 (from 1.4.15). Contributed
by Stefan Seide (stefan @ trilobyte.se.de)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->

Mime
View raw message