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 a9b45ce Updated SaxonHE to 9.9.1-8 (from 9.9.1-7) Updated asm to 9.0
(from 7.3.1) Updated bouncycastle to 1.67 (from 1.66) Updated caffeine to 2.8.8
(from 2.8.0) Updated commons-codec to 1.15 (from 1.14) Updated commons-io to
2.8.0 (from 2.7) Updated commons-net to 3.7.2 (from 3.7) Updated jackson to
2.10.5 (from 2.10.3) Updated json-path to 2.5.0 (from 2.4.0) Updated junit to
4.13.1 (from 4.13) Updated ph-commons to 9.5.1 (from 9.4.1) Updated ph-css to
6.2.3 (from 6.2.1
a9b45ce is described below
commit a9b45ce260adeb75dcadf7089dfa8752b05472fa
Author: pmouawad <[email protected]>
AuthorDate: Sat Dec 12 17:19:49 2020 +0100
Updated SaxonHE to 9.9.1-8 (from 9.9.1-7)
Updated asm to 9.0 (from 7.3.1)
Updated bouncycastle to 1.67 (from 1.66)
Updated caffeine to 2.8.8 (from 2.8.0)
Updated commons-codec to 1.15 (from 1.14)
Updated commons-io to 2.8.0 (from 2.7)
Updated commons-net to 3.7.2 (from 3.7)
Updated jackson to 2.10.5 (from 2.10.3)
Updated json-path to 2.5.0 (from 2.4.0)
Updated junit to 4.13.1 (from 4.13)
Updated ph-commons to 9.5.1 (from 9.4.1)
Updated ph-css to 6.2.3 (from 6.2.1
---
checksum.xml | 3 +++
gradle.md | 3 +++
gradle.properties | 26 ++++++++++++-------------
src/dist/src/dist/expected_release_jars.csv | 30 ++++++++++++++---------------
xdocs/changes.xml | 12 ++++++++++++
5 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index d65508c..1ff8af1 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -10,6 +10,7 @@
<trusted-key id='af10873874630863' group='com.flipkart.zjsonpatch' />
<trusted-key id='379ce192d401ab61' group='com.formdev' />
<trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
+ <trusted-key id='07d3516820bcf6b1' group='com.github.ben-manes.caffeine' />
<trusted-key id='3c0a8f4744f37328' group='com.github.ben-manes.caffeine' />
<trusted-key id='8ea48d105232855d' group='com.github.jknack' />
<trusted-key id='218fa0f6a941a037' group='com.github.kevinstern' />
@@ -51,6 +52,7 @@
<trusted-key id='3faad2cd5ecbb314' group='commons-beanutils' />
<trusted-key id='411063a3a0ffd119' group='commons-beanutils' />
<trusted-key id='9daadc1c9fcc82d0' group='commons-cli' />
+ <trusted-key id='21939ff0ca2a6567' group='commons-codec' />
<trusted-key id='86fdc7e2a11262cb' group='commons-codec' />
<trusted-key id='1861c322c56014b2' group='commons-collections' />
<trusted-key id='a41f13c999945293' group='commons-collections' />
@@ -63,6 +65,7 @@
<trusted-key id='33cd6733af5ec452' group='commons-logging' />
<trusted-key id='a41f13c999945293' group='commons-logging' />
<trusted-key id='7a8860944fad5f62' group='commons-net' />
+ <trusted-key id='86fdc7e2a11262cb' group='commons-net' />
<trusted-key id='3449ec3ac2efe8aa' group='dnsjava' />
<trusted-key id='379ce192d401ab61' group='info.picocli' />
<trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
diff --git a/gradle.md b/gradle.md
index 49455b5..69a2c1c 100644
--- a/gradle.md
+++ b/gradle.md
@@ -48,6 +48,9 @@ However it might be useful to perform a "clean" build:
# Expected checksums are stored in /checksum.properties file
# Actual checksums are stored in
/build/checksum/computed.checksum.properties
+ # Update expected dependencies after updating a dependency version
+ gw -PupdateExpectedJars check
+
## Static checks
### Release Audit Tool
diff --git a/gradle.properties b/gradle.properties
index 81fe0fa..fb1b2f0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -55,23 +55,23 @@ accessors-smart.version=1.2
activemq.version=5.16.0
apache-rat.version=0.13
apiguardian-api.version=1.1.0
-asm.version=7.3.1
-bouncycastle.version=1.66
+asm.version=9.0
+bouncycastle.version=1.67
bsf.version=2.4.0
bsh.version=2.0b6
-caffeine.version=2.8.0
+caffeine.version=2.8.8
cglib-nodep.version=3.2.12
-commons-codec.version=1.14
+commons-codec.version=1.15
commons-collections.version=3.2.2
commons-collections4.version=4.4
commons-dbcp2.version=2.8.0
-commons-io.version=2.7
+commons-io.version=2.8.0
commons-jexl.version=2.1.1
commons-jexl3.version=3.1
commons-lang.version=2.6
commons-lang3.version=3.11
commons-math3.version=3.6.1
-commons-net.version=3.7
+commons-net.version=3.7.2
commons-pool2.version=2.9.0
commons-text.version=1.9
darklaf.version=2.5.3
@@ -92,19 +92,19 @@ httpclient.version=4.5.12
httpcore-nio.version=4.4.13
httpcore.version=4.4.13
httpmime.version=4.5.12
-jackson.version=2.10.3
-jackson-databind.version=2.10.3
+jackson.version=2.10.5
+jackson-databind.version=2.10.5
javax.activation.version=1.2.0
jcharts.version=0.7.5
jdom.version=1.1.3
jmespath-core.version=0.5.0
jmespath-jackson.version=0.5.0
jodd.version=5.0.13
-json-path.version=2.4.0
+json-path.version=2.5.0
json-smart.version=2.3
jsoup.version=1.13.1
jtidy.version=r938
-junit4.version=4.13
+junit4.version=4.13.1
junit5.version=5.7.0
log4j.version=2.13.3
mail.version=1.5.0-b01
@@ -114,11 +114,11 @@ mongo-java-driver.version=2.11.3
neo4j-java-driver.version=4.2.0
objenesis.version=2.6
oro.version=2.0.8
-ph-commons.version=9.4.1
-ph-css.version=6.2.2
+ph-commons.version=9.5.1
+ph-css.version=6.2.3
rhino.version=1.7.13
rsyntaxtextarea.version=3.1.1
-Saxon-HE.version=9.9.1-7
+Saxon-HE.version=9.9.1-8
slf4j.version=1.7.30
spock-core.version=2.0-M2-groovy-3.0
springframework.version=4.3.17.RELEASE
diff --git a/src/dist/src/dist/expected_release_jars.csv
b/src/dist/src/dist/expected_release_jars.csv
index bd725ab..570d4b9 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -1,21 +1,21 @@
30035,accessors-smart-1.2.jar
2387,apiguardian-api-1.1.0.jar
-121836,asm-7.3.1.jar
+121783,asm-9.0.jar
113369,bsf-2.4.0.jar
389033,bsh-2.0b6.jar
-879660,caffeine-2.8.0.jar
-201216,checker-qual-2.10.0.jar
-347669,commons-codec-1.14.jar
+921827,caffeine-2.8.8.jar
+230905,checker-qual-3.8.0.jar
+353793,commons-codec-1.15.jar
588337,commons-collections-3.2.2.jar
751914,commons-collections4-4.4.jar
207774,commons-dbcp2-2.8.0.jar
-276413,commons-io-2.7.jar
+285424,commons-io-2.8.0.jar
267634,commons-jexl-2.1.1.jar
397422,commons-jexl3-3.1.jar
577742,commons-lang3-3.11.jar
61829,commons-logging-1.2.jar
2213560,commons-math3-3.6.1.jar
-305844,commons-net-3.7.jar
+307003,commons-net-3.7.2.jar
134858,commons-pool2-2.9.0.jar
216211,commons-text-1.9.jar
1549589,darklaf-core-2.5.3.jar
@@ -29,7 +29,7 @@
336171,darklaf-windows-2.5.3.jar
98115,dec-0.1.2.jar
320748,dnsjava-2.1.9.jar
-13161,error_prone_annotations-2.3.3.jar
+13854,error_prone_annotations-2.4.0.jar
1702975,freemarker-2.3.30.jar
32359,geronimo-jms_1.1_spec-1.1.1.jar
7946113,groovy-3.0.5.jar
@@ -49,9 +49,9 @@
328593,httpcore-4.4.13.jar
369320,httpcore-nio-4.4.13.jar
41792,httpmime-4.5.12.jar
-68079,jackson-annotations-2.10.3.jar
-349108,jackson-core-2.10.3.jar
-1404171,jackson-databind-2.10.3.jar
+68080,jackson-annotations-2.10.5.jar
+349331,jackson-core-2.10.5.jar
+1404939,jackson-databind-2.10.5.jar
78030,javax.activation-1.2.0.jar
142391,jcharts-0.7.5.jar
16537,jcl-over-slf4j-1.7.30.jar
@@ -62,11 +62,11 @@
220475,jodd-lagarto-5.0.13.jar
19858,jodd-log-5.0.13.jar
26047,jodd-props-5.0.13.jar
-223186,json-path-2.4.0.jar
+231720,json-path-2.5.0.jar
120316,json-smart-2.3.jar
393851,jsoup-1.13.1.jar
249924,jtidy-r938.jar
-381765,junit-4.13.jar
+382708,junit-4.13.1.jar
48483,jxlayer-3.0.4.jar
201685,log4j-1.2-api-2.13.3.jar
292301,log4j-api-2.13.3.jar
@@ -78,12 +78,12 @@
419054,mongo-java-driver-2.11.3.jar
4580832,neo4j-java-driver-4.2.0.jar
65261,oro-2.0.8.jar
-1299088,ph-commons-9.4.1.jar
-505816,ph-css-6.2.2.jar
+1302550,ph-commons-9.5.1.jar
+506329,ph-css-6.2.3.jar
11369,reactive-streams-1.0.3.jar
1315838,rhino-1.7.13.jar
1196575,rsyntaxtextarea-3.1.1.jar
-5498326,Saxon-HE-9.9.1-7.jar
+5506669,Saxon-HE-9.9.1-8.jar
276420,serializer-2.7.2.jar
41472,slf4j-api-1.7.30.jar
301161,svgSalamander-1.1.2.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a1de93d..5038198 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -114,6 +114,18 @@ Summary
<ch_section>Non-functional changes</ch_section>
<ul>
+ <li>Updated SaxonHE to 9.9.1-8 (from 9.9.1-7)</li>
+ <li>Updated asm to 9.0 (from 7.3.1)</li>
+ <li>Updated bouncycastle to 1.67 (from 1.66)</li>
+ <li>Updated caffeine to 2.8.8 (from 2.8.0)</li>
+ <li>Updated commons-codec to 1.15 (from 1.14)</li>
+ <li>Updated commons-io to 2.8.0 (from 2.7)</li>
+ <li>Updated commons-net to 3.7.2 (from 3.7)</li>
+ <li>Updated jackson to 2.10.5 (from 2.10.3)</li>
+ <li>Updated json-path to 2.5.0 (from 2.4.0)</li>
+ <li>Updated junit to 4.13.1 (from 4.13)</li>
+ <li>Updated ph-commons to 9.5.1 (from 9.4.1)</li>
+ <li>Updated ph-css to 6.2.3 (from 6.2.1)</li>
</ul>
<!-- =================== Bug fixes =================== -->