This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov 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 873560160b fix(deps): update wiremock to 3.13.1
873560160b is described below
commit 873560160bd781b97ea59b766c5efdba051cde5d
Author: Mend Renovate <[email protected]>
AuthorDate: Mon Mar 24 06:33:17 2025 +0000
fix(deps): update wiremock to 3.13.1
---
gradle/verification-keyring.keys | 276 +++++++++++++++++++++
gradle/verification-metadata.xml | 37 ++-
src/bom-testing/build.gradle.kts | 2 +-
src/bom-thirdparty/build.gradle.kts | 2 +-
.../backend/influxdb/HttpMetricsSenderTest.java | 3 +-
src/dist/src/dist/expected_release_jars.csv | 6 +-
src/protocol/http/build.gradle.kts | 2 +-
.../http/sampler/ParallelResourcesAndIpSource.java | 14 +-
src/testkit-wiremock/build.gradle.kts | 2 +-
.../apache/jmeter/wiremock/RequestCountDown.java | 14 +-
10 files changed, 325 insertions(+), 33 deletions(-)
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index 6a244c4a0c..eb0d2dc9f0 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -582,6 +582,21 @@
X5YMgwSL9/YSSjMR2mQTEdyWCrEf9V16o1+9cceijPsDp0NNKG8hoieZhC+WqPHJ
=ovHb
-----END PGP PUBLIC KEY BLOCK-----
+pub 9266326161C26F29
+uid Lukas Krecan <[email protected]>
+
+sub 315AC4FAFFE2E4C0
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZcE89BYJKwYBBAHaRw8BAQdA7Ni9rQFR9Uw6LaJRNfxMfrAKM/DHwZF5WtGM
+SFy4gdG0H0x1a2FzIEtyZWNhbiA8bHVrYXNAa3JlY2FuLm5ldD64OARlwTz0Egor
+BgEEAZdVAQUBAQdAEdB/seuPDCQkURZTgPLfmuuyCwl+iHXMD4xaE+WvrhwDAQgH
+iH4EGBYKACYWIQTu1iAgOISbR/7q0eySZjJhYcJvKQUCZcE89AIbDAUJBaOagAAK
+CRCSZjJhYcJvKZVQAQCxnUXOtUZkdAbLnw4S8GOZ+8u7S4nv5oyiMM4SlU7W/QEA
+rOVOI2fhj6BHyTEUdDX/G56L/D2nMpzzcjG8mCJItw8=
+=KHEO
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 928FBF39003C0425
uid Spring Builds (JAR Signing) <[email protected]>
@@ -974,6 +989,21 @@ z74Y+1/XQhaVY3fqNg==
=SM1h
-----END PGP PUBLIC KEY BLOCK-----
+pub 9E31AB27445478DB
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGLFUBsBDADA5+ZXKX+8DOgWuJqgfU894pplb/jDl3gxDfieWCOf8l+Ii1/Z
+BYqyiy/JWp5mI5Y+nnLafBSvqv5Voqu5m7E88rmsbRYL06Nuss46I/QV0v8Glsx/
+0NekPjuS6kJVWMYeYT5vZ4u44+T+TR3BEKzlQfLaFxIM2DOCzi0/vzrdPLvjGO32
+COu98t4wBcF8nQdgQicfa85PShzT6uOLTRhG2pGDDMlTe8sLJ1+TbDHClHtdM1C9
+YAMV6U/9UjU03HWvbzcJoefl4IZkg1AkVLCvCQx9rvraKJXq7s7IUjHKkj+7cheh
+55VAeO68r4XlLVPTZCeTsmLvJlJKVpYw/VEyeT5yD0cSoZztD8wzbs3O+ZjzG7Z/
+DIiwAty/ixdwYDOnDdP2AagUIutzi5iIKaWVMkgelADa4AyyEfmzZa//JKrnYVoU
+RRGi9WkUJYQwQxCvDq7x4wz6uG6M+01Rk5UNrAwrWVPA2QDluLJ4/87oZFpWs3vL
+UkHwJryFEsC5fvUAEQEAAQ==
+=LKcH
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 9EB80E92EB2135B1
uid Slawomir Jaranowski <[email protected]>
@@ -1518,6 +1548,36 @@
vvzB6IAo6+u3AQDURXWfVKKr73oZFosnOt63VHnW6BV9mMqjj3wenu9FlQ==
=Kqmv
-----END PGP PUBLIC KEY BLOCK-----
+pub AFBD3AF8EAFA72DA
+uid Stefan Bodewig <[email protected]>
+
+sub 7280CDF0944021EB
+sub 23738DFD7C40DE43
+sub 5CF0293EA49D19DD
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZ3LX/xYJKwYBBAHaRw8BAQdAIdAjqLeHEeaXXtvamSE2M95tcMTIgPQuvvSz
+BqTnpEK0I1N0ZWZhbiBCb2Rld2lnIDxib2Rld2lnQGFwYWNoZS5vcmc+uDMEZ3LZ
+kRYJKwYBBAHaRw8BAQdAZeHA/xPzLbmHCIYqrguQWSGZcQowJLnVVi3qLeTg9C2I
+9QQYFgoAJhYhBLwmxTr1Mfi0s/WTCq+9Ovjq+nLaBQJnctmRAhsCBQkFo5qAAIEJ
+EK+9Ovjq+nLadiAEGRYKAB0WIQQAV2cH1DOdzYiPrAJygM3wlEAh6wUCZ3LZkQAK
+CRBygM3wlEAh6zTLAP9Jnxxgj6f2+NCzDjVZY1OOIMMJK36hdmIzvVwqu8cLGgEA
+luqqLtzs+O2G6xe/RgYiA0wsmYiYQ62Mi0ubAnc/LQommAEA/kr7WBndUSqCPs8Z
+5x0eERdbKUaQM/43GyLQTm19uXABAOTV9fQrmC0EJt99zTtEJOmHQqseeuSbI1+/
+hXBi2+wIuDMEZ3LZexYJKwYBBAHaRw8BAQdAnjgzX41KUvzRR1ht18HWrpmDiSEE
+FuP8nY9Nb7Xo366I9QQYFgoAJhYhBLwmxTr1Mfi0s/WTCq+9Ovjq+nLaBQJnctl7
+AhsCBQkFo5qAAIEJEK+9Ovjq+nLadiAEGRYKAB0WIQRqkxYesZkOg0bnuisjc439
+fEDeQwUCZ3LZewAKCRAjc439fEDeQzmdAQDaMrecftNbQuzrvhomns/ZBpfn4B4d
+Br0RknZA+l0bowD+ORGuCSyemOZarGba7iIOd7cGjLnGNeVPQ7ymnmSRnwjKyQD/
+TUGY+dJrA0b39CPfXOwKxtkwTpifTR/+RF+rFMqpGUUBAN5FO/6OrOpOaNaBS0jj
+ZbvDfSERKlfE+P47d6zm3QgPuDgEZ3LX/xIKKwYBBAGXVQEFAQEHQGzQJC2D3B64
+mOg20hAlCftcfA9HQa005px3upnGYRkpAwEIB4h+BBgWCgAmFiEEvCbFOvUx+LSz
+9ZMKr706+Or6ctoFAmdy1/8CGwwFCQWjmoAACgkQr706+Or6ctpB4wEAykj/I0p8
+J3ydtrFDLoPLopH0hYFjMppfl/q7+Gq3wVQA+wT46QO4EimDLt69hB0+MlKRvBXd
+ykWk1Wysqwq51xwM
+=JFPz
+-----END PGP PUBLIC KEY BLOCK-----
+
pub B0F3710FA64900E7
sub 7892707E9657EBD4
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -1639,6 +1699,42 @@
BQJKMGw7AhsMAAoJELNB3bAg/Larfc0AnAmQbEg9XnLr/t0iUS7+V7FcL5KpAJ9k
=DGI6
-----END PGP PUBLIC KEY BLOCK-----
+pub B460E7C4ED66826D
+uid ethlo <[email protected]>
+
+sub CF1DA7EADAD9F49D
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF6GGxUBDAC3c0QZ72oaErIkaF/xEzAId982m5FgtV3DpZAANZyPRK9csDci
+49QPkqpLM/QCmxGYn1ckZJQmXsGjrNuCFKDCEsKwFa4h0IsoHn2OlqCBNq3MxeFm
+sGtYAqZ1d/pChyKZIi2yk1UMHEufm78jSgLS/WX0DRe3xNn6j1/lVguulwHnM6GM
+HbSahVIlt6Eeh25VKpSJ0ACC3zFopeIwX91nmXmDwslU4HbQZvZ3TC2murj7x5Fs
+K7rU0lOHor0L4Y7lAjosKqUFMHKzreSEhvgGDSg8KpVdQXprd6vsWo+2Ys9+aA9J
+tbfO94px4B6dH0pwCFlw3YveAhxQV9ZGpch4dhb+38Ffm4o9eCyqYn4K4ZUWYyOU
+YzGemfADmX0DLFTo3OcLkwfCOQppGaL6x7Ym8VWXv31zH9esmsXizmlGK81964oo
+pT2HlpL9XIAFHd2Efh29soVsXSOfmHenGSpcpV6fmH7HjfInVl2aQsXzvcKNeOFV
+qrismNf06p18BAEAEQEAAbQXZXRobG8gPG1hdmVuQGV0aGxvLmNvbT65AY0EXoYb
+FQEMANanagx2CO3gBzIEHHhnwJj+jRQ7Sir9QrYMeeMMPkbWZ+mmUsjYopL90WXF
+VNj2kRA4cci10JIurUm7FtLUQ98szeMgmrdjbw44A1Mligyvhfgk2vgrhG5SOG4S
+OedQEnEeHKjQsM9cRfc30Fdl01eLWIJJdagywb/mpKhMItbUuu1DAww+bdbt2CWX
+rurCJu1L9Wr9/a/ws8Ydfk/mM2vRtbB8qGu6MQiCXJ/qk1dVAn2TutopT9ERTHVq
+j2rslpSzETUIy0Js+V7jygZVp8RPQciqtiHNt61YiV8K3kVh06wbYwACiF6HE+pQ
+m5fG7n5dMUXMN3ov+B3RUtCDIC1LVyg8jfT90gklF4hDSm7rmKGDoU1O9JOBrunX
+xzC+eYPxiKd0UUEGqBfn7PhB9tQT2IsvDxP59yF7oY6pnQszyv/SW0c5PlILbYWz
+63f0sb4q3RACKv+F55j4ZGbeNEdUYJk7eAP8Lv8c3uGgxJ+qtcsdcqAbHzSXwonz
+H3QlGwARAQABiQG8BBgBCgAmFiEEsoaEbDQbty0eX4XKtGDnxO1mgm0FAl6GGxUC
+GwwFCQPCZwAACgkQtGDnxO1mgm3mCAv/b8RjgGsVU4hFPqAsrCoOueiQgiJhrbq5
+gwVyCsB4TQTYwgd1I6EJKu7TxmoYtosjisxqoGq059UfNSO6vOX+8osMzfLBZYmH
+1qrTmsKCAz7aInRs3b5oZzg2jQP0AU1IVPxbfmqPtZBRh9pV4Q9whkbM3RYQX/4G
+T72kZWI0+SyhUyZ03LZAphh5iFo2eDnzYa6YSC5M/zyzJ8i3Rg8GoIuYYrC/eFVp
+Axl7QzlsuXamCWVp+bxUK9uzr2K2dZYnm/fqPv5foLjdsKoziOCVJIjtNk+CTLNe
+VnI0pCmL/oDCql5q70GRQiA1WWC/geCy+aSD2kNPiDtAoLiQgAWLR7V1/5llDQ26
+l94OGXKc0+w/qMZano87wau3p5ct2cAGf9N4BFHITEo/AgkhngOB3W/njg8sO9B/
+uEGefNSYlEWXseq+ucvUlrtStV0lKYVBKAgFibb0Wk8ayfSvIfDI/9Kd610n/IOI
+cZYUskQLV+tetMac6Lb3AOJ7HzGV3DSn
+=6FIP
+-----END PGP PUBLIC KEY BLOCK-----
+
pub B7C3B43D18EAA8B7
uid Karl Heinz Marbaise (SoftwareEntwicklung Beratung Schulung)
<[email protected]>
@@ -3340,6 +3436,21 @@
IQkQ9C6H+WZQFckWIQTzGEvNVfTQFuMNTJv0Lof5ZlAVyX7PAJ9ztvyEP04cy6zP
=dtK1
-----END PGP PUBLIC KEY BLOCK-----
+pub F5C81DE10A0B8ECC
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGY/odABDADzlZ1BXT0zN3rL+z4HP8r/2xM6zN950fwRimBTOiT6uE8aQSxq
+283R/gIgM+yQBGjStLP3k/TsFJ2FCz7sug+7s1RP70ymkshalTRg+9QHBr2MU1Cx
+Xoh3fiH8BLOb3FIxH1wdAtOOoNxbz64Ftcptu3L0I1y2qEwOGNOyvqbntdCuwNbX
+/zwZUyb3tOVVrrZ5bp+6jMoBKEEWS7effqhGqXLlO4yTMBXR4pwzhch2IGCe+4M3
+a5C2SIJbR70PMk6aJ2+no2LycYRYJx/t2umAbxuCtwT6t/xh8v5ekbXAu5G3h5y+
+T2bF8rjMhVe6DBgJ08uFge3Oom5a5uZx8sQASdLCng8nKjGO4Q8jWmsEj+OiHnnX
+g0oKkirnWbAVrWysgNKAXfwGfDBG95K1F67kVhNjXTx0MDcxpsT9TPxz/nDuzRpQ
+ey5M11+Bl/fEM5UuzRpPgPd//bU+L3FgEUguB4kzsiYlhsUQRyCq1x868AchLWey
+vaVIq2DY101GIP0AEQEAAQ==
+=YHos
+-----END PGP PUBLIC KEY BLOCK-----
+
pub F6BC09712C8DF6EC
uid Uriel Chemouni (dev) <[email protected]>
@@ -4194,6 +4305,61 @@ YauuFdKHKzn72X+iAJQgiVtlHt5xxm8DnCt8RGdK9ohuBCmE4xkiXw==
=Kajw
-----END PGP PUBLIC KEY BLOCK-----
+pub 10C01C5A2F6059E7
+uid Mark E D Thomas <[email protected]>
+
+sub A05557215E763BEC
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=MTrZ
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 1241BC872C5E4EC0
uid Henri Yandell (For signing ASF releases) <[email protected]>
@@ -5493,6 +5659,34 @@ E/XhP4QkRJrZI1F/
=Jm2n
-----END PGP PUBLIC KEY BLOCK-----
+pub 37B0A85F5CE89B0C
+uid Jan Bartel <[email protected]>
+
+sub F4C2E0BAE735043B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF13JbQBCAC5jCFhdOUjOjKXayzbVXWZ+wY/htARuLE8wgcVu5xBl996esmb
+a+d4/hB167TjbdPzrT5nBI+QpgaSsGrBQQhnImLnhDQJOww1pbclF/DpZkDry2JH
+4kmuKwkNlaXsYqIv4aE+SdP084ZfjBVdgS/nHkzc/VwVhSUr2pV0dwD3oSRBdIo1
+KgNMHwRoUOJ4B4jxFINap+m1DNdal9M/4aGkJwE4hv1pt/A0coL/Y3Y2c/xyNzz8
+eRMPSnLELjIKmNikcd/Ts+lsVy+YETkUIce+YF3t93Y+PBuoxiSkYW+EF8ctskWK
+Mta5WTwatuLfgc3GVkSnPs9NWyufAba+fjz3ABEBAAG0HUphbiBCYXJ0ZWwgPGph
+bmJAd2VidGlkZS5jb20+uQENBF13JbQBCACqdEUpA0xJfi4HAeJBwZSb0SS+jbZP
+gRayP8TQlfK6i7UZjwR2/W0QCKUTlO3dJ23bNYRnOD7MobQspM/hDmQbGCTEYs0O
+Dj2Om6o4AZmOn6MW8QDE7VkW1rx/zEM23YYSS8o2Js/jAU0+B3fxtNUW1aXNek2/
+dXLxbRb9kbKU2fvx7FPlQGDzjDdvxr45xvlwaibI129L8VmqqFY0JuaQOSspvGy5
+ahVfAisyTHdL1XQ7BZhjh5pmxpxezWioRLZO+YcDW93BVDcdMJigY+wC4W7tXzs4
+qOuVSUxamk7XIhYD2K5eztJuUVW/8T1qDlTy4QN4OGFtUQ26RPAGZkfDABEBAAGJ
+ATYEGAEKACAWIQQaLWCL9tN67xLVOk83sKhfXOibDAUCXXcltAIbDAAKCRA3sKhf
+XOibDJ9xB/9tNrIKnuS3s5ofLFVqufg9xw8/lOgtTiasKbMwbDyfTW/4Itg6lcrx
+8oUAVV1LPeo+Fx4tpnS/oaDd0nv2DdIITmSq29yxYyCocCcfTLm0V3eKRliOYTj5
+VBER8gh7pOJqO1aSlM6b0NpcJuoW7VniokugdJJlIemZgYrnSlztjKaVbfJPKIUC
+D8dLC32i0B5MEwtpjWSMh37EcC9r5l9am6rfd/Y4bEHEF7Dx/CBL3US55MQ1Vejs
+wE0zZV3fOXs1SJRPs0AqwMoUMaKcypgtXhyKJp6YxxuRPvBEVB0Ofz4SKxxjmMBt
+7KLHmod19SouonvoOPMekaoIHsnJ6SeJ
+=vFzc
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 38F47D3E410C47B1
uid Vladimir Sitnikov <[email protected]>
@@ -5646,6 +5840,31 @@
LBaslDFjyxMECWr3v7TuEmEmNcD+KwNyACFNuBjEBWeuJZYwCkAkVy8AyitrTMh8
=ec6I
-----END PGP PUBLIC KEY BLOCK-----
+pub 3EFC46EE83C40224
+sub 2401EE009B11575B
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFfJfakBCACebHYGckuH6xTvSWARlY1P/PJ+qSsJ/oFOrcG219GERXXO5s3+
+HId4Qm76C4dWKlAJN8P3sXYAlmHrC452dbwiRUUqd0fuoSR7viLyuMvSpcNIzJdh
+CvCVJYdk1hH39/VXAEWN9P2WSinUIj4tdO+UfjaL3oeInPtrR7F0yvKFVTkBQSze
+jOxbPhTcL17g/ihbuXqMCtm/yjlRR3B2w+cZcEvdRoQHYBoHGw3Gom1Sr5be3sn+
+K/wPFdshWKDvUZDrqFp91icqKAlOcHLYaJskWT8Vb+vF5c1zdAxJhUEYcUZUPr/H
+DNSWYkmYbugc4uOx3Qe3i+7x9oCk1GP1RlVdABEBAAG5AQ0EV8l9qQEIAK+bhc6S
+2RqCFmPcp4Odh+MhjxvR7irpd+KFLvLMOEdSl1mgplB4hY+0jp9y0rXOZFEC8odU
+/jv6uqBl7lVSNRPstQxNT6HF8cmzuYtf7N8HNUwPLlkIRgxILnFQDjm/bhgNRAo2
+deSaC7G6JxMdhVLkNUjSj7LyYEvzXmntmacJzhQHj72EMqihnJvppsYogowNe8dM
+K66ApwyUowTivpZVx7Chx6pmiHdxroagYUKoSyfsisUO78WpJR/1E2XL6hT3Y9Nd
+4/piDIeY4kENF/Sqhsf2SPQONhJ/gGNaONzQk27MC4ko/t7Wjn8avOG+og253ufQ
+x/3h9aKhgLaoOvsAEQEAAYkBNgQYAQIACQUCV8l9qQIbDAAhCRA+/Ebug8QCJBYh
+BK6x4a7ANcZvo5WJ0T78Ru6DxAIkkGwH/2LBw5jF4ji1Vdj0a996A/GW29tNhM0Y
+kL47Gax2G8SLNbPC9GU36p7u88/j0qPaBqPgNnHNOd2dgMemm7FSgKrj8H8hZKyM
+Dc3Y6A64Ab4vcNNawHB04r9HJWN9gMHqwHJYMkdnzHC+3nurbvUEcNIaVzwCzVng
+5e7s7JpLgdLYZ1nMtRZjfgYmT+DhplGzcr0pLKobvL9TMi3Nob70ysvgtKW2/FJ7
+qdNv533xRVXLO7KHM6RcQMnVUuWFaUToip8Xqc9ss3638UE1DZdfJk0ykthRlTjD
+aTBmCu/YU5nL2vvCqIyIQ/Ykapv/YbWaU9b4AV61oVClCiVeY12b0cA=
+=wSYG
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 3FAAD2CD5ECBB314
sub 3260CB2DEF74135B
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -6082,6 +6301,35 @@ J6jqJeZDwjISStUqtlM2ACKov6zJC0QodTq3cxI=
=7uxM
-----END PGP PUBLIC KEY BLOCK-----
+pub 4692A312EF600C15
+uid WireMock Release Bot (See the wiremock/community docs)
<[email protected]>
+
+sub 6BFDA69683BBEA4A
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGUtW3gBCAChS/J82zuStCV9PjvQHdwPHVuWZMi2gSZvDouup4A2E1ikWLS4
+SHS9H9eU/lEDMLwuitpXOz6pU115SXJ8GZFB7V60+MuS+aHMcdxrpvA+0jachJzZ
+vKPphHeCBIBWNg3kZB7NItW1zwneB2OHMFP+s8XRPbLqwvHdq9XyxX2H6Cx2G7zT
+EccT0N0RfS+WNcQLajdUvvMIhkryg+G+jsz2fDJr5bwXV8pQfft8LMMsRX1xxcMS
+X0x8pqy6JXJhNwqOb2r353U1hNLIXASgURlk5KAvEFAIrLFFIgD0Z2J0Tqk+4vHg
+4c9ggJ5jW/FCRDINTYb68dgMs+k4qPwVaP1JABEBAAG0UVdpcmVNb2NrIFJlbGVh
+c2UgQm90IChTZWUgdGhlIHdpcmVtb2NrL2NvbW11bml0eSBkb2NzKSA8cmVsZWFz
+ZS1ib3RAd2lyZW1vY2sub3JnPrkBDQRlLVt4AQgA0j9WPkRvxbqWI+4MxePnn70w
+HWpJ/roiB/ZaU21p7Iqr8Reg8ZB+N//XWxaU9tTD2cWax58Xf1oGt+jgIkIbh0Pj
+Yiz/L9KFJXvyDo3WW4nFHlII9wt7EaEJ8AZS0Sv0fhXfGrrWKj3dLZG6gWKRwhOB
+AIYyHaTbgLox9eAVc1vkiXrlM755XzZ5HzXnuYQsyYEEMe3n9KC4OEkniOD9cl8C
+SPoLojI0Rv27X2HwLGmRyC5pTuc24nVDdkLjQaZiKY07FVmhCZ5RpqtBC8qNZkLd
+DQ+mwNg0PjvgQ3U5JN1fG5AO0n38mzdxbq/EGTuRmXSaH0DklmI9dVplCpCEAQAR
+AQABiQE2BBgBCAAgFiEECkqi18YFOrBo0gaqRpKjEu9gDBUFAmUtW3gCGwwACgkQ
+RpKjEu9gDBXVaAf/cEFXX+vF3o923S2aEeOEs0Gk2D8oB8KQG1MQ+xR2jPdmBSKa
+3HSZVq+ffCr9ysPjf/9KezzWVUW1vpJQG9Wtel1y6tzgnGVTwV2wvwibbu9KXkBs
+ACwLv7c5P9vBvvR3kajcsXYoozVpxvHrb9K3FB3dDUjZs7KB7eDu7TD1vrpEIBto
+SO5nv4EvtGFbWmAve1gaL4DC8g5PeQG9jWQ+XmepMf86HGEth42lHg5A2WtJ6uO3
+2CQaMuZ+pDE25Nv6SWshpxKO65FgckTAKe4DfnFGPGps/WEDsFgMg75Ukb/YTEhi
+La1stwX/Z5ZqDEqNVBvg4BSqzRiXwbmosLRRyQ==
+=rpIZ
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 4A1BAC7F1E3B89B3
sub B4F772A2A08563E5
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -6270,6 +6518,19 @@ pyYELsj5uHzDtLodBkqdZR6WuQ==
=JAXb
-----END PGP PUBLIC KEY BLOCK-----
+pub 55C7E5E701832382
+uid Andrey Somov (SnakeYAML) <[email protected]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mI0EVdDLQQEEAJMtYCaTA56YsP5RzQzPvqVTaR2nZ27qRk36blHB9WmXK+NHpGeH
+PHgq59mLPVueo2/M5k/fFrCe36jHePP31gYpFtueeYDfsofHwod0WhsHyC7JfG8d
+jEnSczTCmOHRZ3ed9ef6SeWUozYCQAX/tAbpoCthe0lTDYhFhkzVCe/FABEBAAG0
+MUFuZHJleSBTb21vdiAoU25ha2VZQU1MKSA8cHVibGljLnNvbW92QGdtYWlsLmNv
+bT4=
+=MKAK
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 56028DF552BA32E2
uid Dokka Release <[email protected]>
@@ -6830,6 +7091,21 @@ MbGOFKhQ4eOuFNSHamKyekKHiShaICR2aZgq
=hSJA
-----END PGP PUBLIC KEY BLOCK-----
+pub 636D10E7975B6E6F
+uid ethlo <[email protected]>
+
+sub 708FD22F6805A6DE
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZtbW6xYJKwYBBAHaRw8BAQdAVRRnooHomzkCvAbwOt9260ltfVmCpI/ibfaL
+ObWFsgS0FWV0aGxvIDxkZXZAZXRobG8uY29tPrg4BGbW1usSCisGAQQBl1UBBQEB
+B0BEfL8PhO+ac4WaOoiQDGTdUuQo3Y9ekfPUfuVRljKfbgMBCAeIfgQYFgoAJhYh
+BLGGeaF6Id55/53osGNtEOeXW25vBQJm1tbrAhsMBQkFo5qAAAoJEGNtEOeXW25v
+4rcBANF7z5GHPMQNErcZdNqIwA8h9/Xmdpe6Yfy546u5hfe0APwI04BjhEW9L8bN
+4rmDTxARN8gDJ41MFXurJAdf4Uo2Cw==
+=DDog
+-----END PGP PUBLIC KEY BLOCK-----
+
pub 6425559C47CC79C4
uid java_re <[email protected]>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 6223139061..62d46d97f2 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -32,6 +32,7 @@
<trusted-key id="07A4FA67A8222F1B39F9EDAEF8052E4E1BD0DB31"
group="org.neo4j.driver"/>
<trusted-key id="08BA61CF501C09F70911B83B82216A03CAA86C78"
group="org.mongodb"/>
<trusted-key id="08F0AAB4D0C1A4BDDE340765B341DDB020FCB6AB"
group="org.bouncycastle"/>
+ <trusted-key id="0A4AA2D7C6053AB068D206AA4692A312EF600C15"
group="org.wiremock" name="wiremock" version="3.13.1"/>
<trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293">
<trusting group="commons-collections"/>
<trusting group="commons-logging"/>
@@ -39,6 +40,7 @@
<trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A"
group="org.apache"/>
<trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D"
group="io.netty"/>
<trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D"
group="org.ow2"/>
+ <trusted-key id="120D6F34E627ED3A772EBBFE55C7E5E701832382"
group="org.yaml" name="snakeyaml" version="2.2"/>
<trusted-key id="124DAC8350968EC2A8260584EE8ECBBBC188FD5D"
group="org.ajoberstar.grgit"/>
<trusted-key id="12D16069219C90212A974D119AE296FD02E9F65B"
group="org.apache.commons"/>
<trusted-key id="13AC2213964ABE1D1C147C0E1939A2520BAB1D90"
group="org.freemarker"/>
@@ -48,6 +50,7 @@
<trusted-key id="187366A3FFE6BF8F94B9136A9987B20C8F6A3064"
group="com.google.protobuf"/>
<trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62"
group="org.apache"/>
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638"
group="org.checkerframework"/>
+ <trusted-key id="1A2D608BF6D37AEF12D53A4F37B0A85F5CE89B0C"
group="org.eclipse.jetty.toolchain" name="jetty-jakarta-servlet-api"
version="5.0.2"/>
<trusted-key id="1AA8CF92D409A73393D0B736BFF2EE42C8282E76"
group="org.apache.activemq"/>
<trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D"
group="^org[.]gradle($|([.].*))" regex="true"/>
<trusted-key id="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A"
group="com.soywiz.korlibs.korte"/>
@@ -67,6 +70,7 @@
<trusted-key id="2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB">
<trusting group="commons-beanutils"/>
<trusting group="commons-codec"/>
+ <trusting group="commons-fileupload" name="commons-fileupload"
version="1.6.0"/>
<trusting group="commons-io"/>
<trusting group="commons-logging"/>
<trusting group="commons-net"/>
@@ -78,6 +82,7 @@
<trusted-key id="2E3A1AFFE42B5F53AF19F780BCF4173966770193"
group="org.jetbrains"/>
<trusted-key id="2E92113263FC31C74CCBAAB20E91C2DE43B72BB1"
group="org.ec4j.core"/>
<trusted-key id="2F39E2A1EB9BC4E78F403B22F6BC09712C8DF6EC"
group="net.minidev"/>
+ <trusted-key id="2FC53E6B1F681184F4CCD637F5C81DE10A0B8ECC"
group="org.yaml" name="snakeyaml"/>
<trusted-key id="33FD4BFD33554634053D73C0C2148900BCD3C2AF"
group="org.jetbrains"/>
<trusted-key id="34441E504A937F43EB0DAEF96A65176A0FB1CD0B"
group="org.codehaus.groovy"/>
<trusted-key id="34D6FF19930ADF43AC127792A50569C7CA7FA1F0"
group="com.jcraft"/>
@@ -118,7 +123,10 @@
<trusted-key id="517B94F8D0A46317A28D8AB30DA8A5EC02D11EAD"
group="net.sf.jopt-simple"/>
<trusted-key id="5719E50EAC5A4B1DD390B72C2A742740E08E7F8D"
group="org.antlr"/>
<trusted-key id="58F086ABB0EDE8F7A04B76C34C00043BEC5CB7CB"
group="com.fifesoft"/>
- <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4"
group="org.eclipse.jetty"/>
+ <trusted-key id="5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4">
+ <trusting group="org.eclipse.jetty"/>
+ <trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
+ </trusted-key>
<trusted-key id="59B06224FD8912E36603BE79FEFE78456EDDC34A"
group="io.mockk"/>
<trusted-key id="5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA"
group="org.apache.xmlgraphics"/>
<trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985"
group="org.slf4j"/>
@@ -132,6 +140,7 @@
<trusted-key id="670BE7D076A0C89F5F07625AE57428DA9E879E7D"
group="^com[.]helger($|([.].*))" regex="true"/>
<trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1"
group="com.google.guava"/>
<trusted-key id="6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688"
group="org.apache.httpcomponents"/>
+ <trusted-key id="6A93161EB1990E8346E7BA2B23738DFD7C40DE43"
group="org.xmlunit"/>
<trusted-key id="6BFAB2E3C6490B421B25C76C9C8C892F91F8E6D1"
group="org.apache.rat"/>
<trusted-key id="6CB87B18A453990EAC9453F87D713008CC07E9AD"
group="xerces"/>
<trusted-key id="6DD3B8C64EF75253BEB2C53AD908A43FB7EC07AC">
@@ -177,13 +186,17 @@
<trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C"
group="org.ow2.asm"/>
<trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B"
group="net.bytebuddy"/>
<trusted-key id="A9789342F598AD5B1175EF357EB97D110DFADD60"
group="com.googlecode.concurrent-trees"/>
+ <trusted-key id="A9C5DF4D22E99998D9875A5110C01C5A2F6059E7"
group="commons-fileupload" name="commons-fileupload" version="1.5"/>
<trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96"
group="info.picocli"/>
<trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118"
group="org.eclipse.ee4j"/>
<trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB"
group="^com[.]pinterest($|([.].*))" regex="true"/>
<trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2"
group="org.apache"/>
+ <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224"
group="com.networknt" name="json-schema-validator" version="1.5.7"/>
<trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F"
group="com.google.code.gson"/>
<trusted-key id="B02137D875D833D9B23392ECAE5A7FB608A0221C"
group="org.codehaus.plexus"/>
<trusted-key id="B0255B26003EF6F82491ACD7254E9C64C264C176"
group="com.github.weisj"/>
+ <trusted-key id="B18679A17A21DE79FF9DE8B0636D10E7975B6E6F"
group="com.ethlo.time" name="itu" version="1.10.3"/>
+ <trusted-key id="B286846C341BB72D1E5F85CAB460E7C4ED66826D"
group="com.ethlo.time" name="itu" version="1.7.0"/>
<trusted-key id="B5569A15406AE682380F3EF8528DC75AA68F0923"
group="jcharts"/>
<trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
<trusting group="commons-beanutils"/>
@@ -234,7 +247,10 @@
<trusted-key id="D76260C72DF74E66268F7770AB049DF4AB24C1EF"
group="org.hsqldb"/>
<trusted-key id="DA7A1BB85B19E4FB05073431205C8673DC742C7C"
group="org.apache"/>
<trusted-key id="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119"
group="org.apache-extras.beanshell"/>
- <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A"
group="com.github.tomakehurst"/>
+ <trusted-key id="E05F005AF50AE94E69701222B9729775C0352D3A">
+ <trusting group="com.github.tomakehurst"/>
+ <trusting group="org.wiremock" name="wiremock" version="3.0.1"/>
+ </trusted-key>
<trusted-key id="E0D98C5FD55A8AF232290E58DEE12B9896F97E34"
group="org.pcollections"/>
<trusted-key id="E2ACB037933CDEAAB7BF77D49A2C7A98E457C53D"
group="org.springframework"/>
<trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480"
group="org.hamcrest"/>
@@ -252,12 +268,14 @@
<trusted-key id="EB1B3DE71713C9EC2E87CC26EE92349AD86DE446"
group="com.google.j2objc"/>
<trusted-key id="EC86F41279F2EC8FFD2F54906CCC36CC6C69FC17"
group="com.google"/>
<trusted-key id="EE0CA873074092F806F59B65D364ABAA39A47320"
group="com.google.errorprone"/>
+ <trusted-key id="EED6202038849B47FEEAD1EC9266326161C26F29"
group="net.javacrumbs.json-unit"/>
<trusted-key id="F254B35617DC255D9344BCFA873A8E86B4372146">
<trusting group="org.apache"/>
<trusting group="org.codehaus.mojo"/>
<trusting group="^org[.]eclipse[.]jetty($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="F3184BCD55F4D016E30D4C9BF42E87F9665015C9"
group="org.jsoup"/>
+ <trusted-key id="F5FEBA84EB26C56457B2CF819E31AB27445478DB"
group="org.infinispan"/>
<trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A">
<trusting group="org.apache"/>
<trusting group="org.codehaus.plexus"/>
@@ -490,16 +508,6 @@
<sha256
value="c5b23ccbfd21011c601bf5b1cfff1a90f3ac3ad6bb1ae89946f3750808b2d9c5"
origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
- <component group="org.infinispan" name="infinispan-bom"
version="11.0.15.Final">
- <artifact name="infinispan-bom-11.0.15.Final.pom">
- <sha256
value="07386ee62c8464618770d209f8c060da8e51f56e76314d1b29caec9c302130e9"
origin="Generated by Gradle" reason="Artifact is not signed"/>
- </artifact>
- </component>
- <component group="org.infinispan"
name="infinispan-build-configuration-parent" version="11.0.15.Final">
- <artifact
name="infinispan-build-configuration-parent-11.0.15.Final.pom">
- <sha256
value="b2f82dd670e70f378a780efea1053f0e660a825dbbfe8c6ca8ca996dfde3aaa0"
origin="Generated by Gradle" reason="Artifact is not signed"/>
- </artifact>
- </component>
<component group="org.jboss" name="jboss-parent" version="36">
<artifact name="jboss-parent-36.pom">
<sha256
value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e"
origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -538,6 +546,11 @@
<sha256
value="958d4f0ee63caee175085f9396d298c2fd88278918bbf3337a32ec74ce488b61"
origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
+ <component group="org.ow2" name="ow2" version="1.5.1">
+ <artifact name="ow2-1.5.1.pom">
+ <sha256
value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05"
origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="org.sonarqube" name="org.sonarqube.gradle.plugin"
version="4.4.1.3373">
<artifact name="org.sonarqube.gradle.plugin-4.4.1.3373.pom">
<sha256
value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf"
origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 564c804415..361448c7df 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
// compilation classpath (e.g. it is used as a transitive by a
third-party library)
// then it should be declared as "api" here since we use
useCompileClasspathVersions
// to make runtime classpath consistent with the compile one.
- api("com.github.tomakehurst:wiremock-jre8:2.35.2")
+ api("org.wiremock:wiremock:3.13.1")
api("io.mockk:mockk:1.13.17")
api("net.bytebuddy:byte-buddy:1.14.11")
api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index 4d54c9168c..4f2da8b246 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -103,7 +103,7 @@ dependencies {
api("org.apache.commons:commons-pool2:2.12.1")
api("org.apache.commons:commons-text:1.14.0")
api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
- api("org.apache.httpcomponents.client5:httpclient5:5.3")
+ api("org.apache.httpcomponents.client5:httpclient5:5.5.1")
api("org.apache.httpcomponents:httpasyncclient:4.1.5")
api("org.apache.httpcomponents:httpclient:4.5.14")
api("org.apache.httpcomponents:httpcore-nio:4.4.16")
diff --git
a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
index 79de86514e..d5ae6d951d 100644
---
a/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
+++
b/src/components/src/test/java/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSenderTest.java
@@ -36,6 +36,7 @@ import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.MappingBuilder;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ServeEventListener;
import com.github.tomakehurst.wiremock.http.RequestMethod;
import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
import com.github.tomakehurst.wiremock.matching.StringValuePattern;
@@ -47,7 +48,7 @@ public class HttpMetricsSenderTest {
private MappingBuilder influxRequest(CountDownLatch latch) {
return WireMock.post(API_URL)
.willReturn(WireMock.aResponse().withStatus(HttpURLConnection.HTTP_NO_CONTENT))
- .withPostServeAction("countdown", Parameters.one("latch",
latch));
+
.withServeEventListener(ServeEventListener.RequestPhase.AFTER_COMPLETE,
"countdown", Parameters.one("latch", latch));
}
static Collection<Arguments> emptyTokens() {
diff --git a/src/dist/src/dist/expected_release_jars.csv
b/src/dist/src/dist/expected_release_jars.csv
index 28e2e92e4f..c7c9a27f23 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -68,11 +68,11 @@
109741,hamcrest-date-2.0.8.jar
181512,httpasyncclient-4.1.5.jar
785639,httpclient-4.5.14.jar
-861640,httpclient5-5.3.jar
+959302,httpclient5-5.5.1.jar
327891,httpcore-4.4.16.jar
368896,httpcore-nio-4.4.16.jar
-855013,httpcore5-5.2.4.jar
-237145,httpcore5-h2-5.2.4.jar
+909490,httpcore5-5.3.6.jar
+242521,httpcore5-h2-5.3.6.jar
41727,httpmime-4.5.14.jar
78480,jackson-annotations-2.16.1.jar
578125,jackson-core-2.16.1.jar
diff --git a/src/protocol/http/build.gradle.kts
b/src/protocol/http/build.gradle.kts
index 804fe8ab07..36551cd999 100644
--- a/src/protocol/http/build.gradle.kts
+++ b/src/protocol/http/build.gradle.kts
@@ -76,7 +76,7 @@ dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind")
testImplementation(testFixtures(projects.src.core))
testImplementation(testFixtures(projects.src.testkitWiremock))
- testImplementation("com.github.tomakehurst:wiremock-jre8")
+ testImplementation("org.wiremock:wiremock")
// For some reason JMeter bundles just tika-core and tika-parsers without
transitive
// dependencies. So we exclude those
implementation("org.apache.tika:tika-core") {
diff --git
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
index 7f0bff9637..2d9d167922 100644
---
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
+++
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/ParallelResourcesAndIpSource.java
@@ -123,14 +123,12 @@ public class ParallelResourcesAndIpSource {
continue;
}
- localIps.forEach(localIp -> {
- if (finalLocal4 != null) {
- res.add(arguments(impl, targetHost, finalLocal4));
- }
- if (finalLocal6 != null) {
- res.add(arguments(impl, targetHost, finalLocal6));
- }
- });
+ if (finalLocal4 != null) {
+ res.add(arguments(impl, targetHost, finalLocal4));
+ }
+ if (finalLocal6 != null) {
+ res.add(arguments(impl, targetHost, finalLocal6));
+ }
}
}
return res;
diff --git a/src/testkit-wiremock/build.gradle.kts
b/src/testkit-wiremock/build.gradle.kts
index 0aa354d375..34b1bcd12c 100644
--- a/src/testkit-wiremock/build.gradle.kts
+++ b/src/testkit-wiremock/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
dependencies {
api(platform(projects.src.bomTesting))
- api("com.github.tomakehurst:wiremock-jre8")
+ api("org.wiremock:wiremock")
api("org.junit.jupiter:junit-jupiter-api")
}
diff --git
a/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java
b/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java
index 8a680c8b86..e373709050 100644
---
a/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java
+++
b/src/testkit-wiremock/src/main/java/org/apache/jmeter/wiremock/RequestCountDown.java
@@ -19,20 +19,24 @@ package org.apache.jmeter.wiremock;
import java.util.concurrent.CountDownLatch;
-import com.github.tomakehurst.wiremock.core.Admin;
import com.github.tomakehurst.wiremock.extension.Parameters;
-import com.github.tomakehurst.wiremock.extension.PostServeAction;
+import com.github.tomakehurst.wiremock.extension.ServeEventListener;
import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
-public class RequestCountDown extends PostServeAction {
+public class RequestCountDown implements ServeEventListener {
@Override
public String getName() {
return "countdown";
}
@Override
- public void doAction(ServeEvent serveEvent, Admin admin, Parameters
parameters) {
+ public void onEvent(RequestPhase requestPhase, ServeEvent serveEvent,
Parameters parameters) {
+ if (requestPhase != RequestPhase.AFTER_COMPLETE) {
+ return;
+ }
CountDownLatch latch = (CountDownLatch) parameters.get("latch");
- latch.countDown();
+ if (latch != null) {
+ latch.countDown();
+ }
}
}
