diff --git a/checksum.xml b/checksum.xml index cbbfe400079..7829b768412 100644 --- a/checksum.xml +++ b/checksum.xml @@ -5,6 +5,7 @@ + @@ -86,6 +87,7 @@ + @@ -192,6 +194,7 @@ + @@ -201,6 +204,7 @@ + @@ -301,12 +305,18 @@ 45405C083334B05EFA07572497B9D510CA771AF32CE93D960BE802216A9714FFFF8418384EA48E197D3DFB6EBEC4EC3E610155841E8A257A7FB9A4BD6A1B668F + + 3BBD29761622714AC61DBE02B8351188573F819BDABFB4025196A3F1561BFE52CC308AF9208184F7339C66988E7F8AD323C5CD7B0FA8463321B6BB03E4A9181E + 3E9E1EE9A44EA15044B588B06A956AC150A37B63C161BF9B08A60539F5C90EFC7718DEB24FD084F503B68092516AAC3349DBB74049777EA4C6619AC26090A1D 13F4609FE72DF98C81F86D25616E5B0CE1426688AA5A9DD953733FA98A8DEADB87B3E69A77741DC9D31DD4485265D3B9E4EC71D99346E4A7558F2500F3677714 + + 087931C6F254C7E54FF75B6E94983D062B62B68356A988A5ED276819BCB4FAFBAD2F0BBC363E16C8DAA09ED8189241F08EFF6E8E5F5F3DDC770B541D96FC8E2D + 16D30BE564723B74F312B4E7D06F349370FB6726B3162778C869CD723ECA2A40C4972C2757B3E107E1820CEC0D70B0BD2B96EFCD466518FC64495F7AEF97967A @@ -402,10 +412,14 @@ 37A13B129F3536A53F2A553151A53997DA6DE7CE4D7231EFEEFD26A68C92BE309666F2EE1F527D3B8C38BC6ADDC9FCCBBDD0D134759FD88667976B0CFF842435 + EC2200E5A5A70F5C64744F6413A546F5E4979B3FB1649B02756FF035D36DDE31170EAADC70842230296B60896F04877270C26B40415736299AEF44AC16C5811C AC0896B9A3FEA71644330DAEF4ECCB33005B5B7AC1E1D1D73EED2B2A1F4B2282057F3C0F3698B899E1C76B19C09C69BF4CD0EE548427B9BCC676B791DB5C36BC + + 1086A52924ADD2406E0B4EC7219A8783AC20E02A32A7A2461EFBF092F0070501F7CADE9C0588907C403352F1A48F80B950E6D40B2E4E3E9EB886E7DB4E97BDEC + ECA19B8A6B04C279B7982B16F1763CA1D49B0081A8D4CA2B7419F057D22A0EC60795EB4D901C5EB25DD4A733248876AA2F522C17A6144A26C8EDE9FB2F84531A diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/08/fc9bdc25fb378008.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/08/fc9bdc25fb378008.fingerprints new file mode 100644 index 00000000000..ab015cedb86 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/08/fc9bdc25fb378008.fingerprints @@ -0,0 +1 @@ +41cd49b4ef5876f9e9f691dabac30622339994c4 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/3f1eb974e7ab9b37.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/3f1eb974e7ab9b37.fingerprints new file mode 100644 index 00000000000..0969b99054c --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/3f1eb974e7ab9b37.fingerprints @@ -0,0 +1 @@ +c668130c58722c9dc1c0fc633f1eb974e7ab9b37 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/37/c668130c58722c9dc1c0fc633f1eb974e7ab9b37.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/c668130c58722c9dc1c0fc633f1eb974e7ab9b37.asc new file mode 100644 index 00000000000..4b0d026fda5 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/37/c668130c58722c9dc1c0fc633f1eb974e7ab9b37.asc @@ -0,0 +1,24 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEqeQPYRBACiaEylrnzFWbHE+Zca8bgA9/iex2gOzLDqtS9+3Uf1y0m/BDj6 +m0VBpDlHDUyd2jcLdewO5If2D/fQ0JIHxBHTWKG0CctL4OB1kDMlF0Ue4mTfbIS0 +wxuqonh4iCoKUFx0SRDRlpAoEQdbIZCdadBOlMv5cWMBABXi3rvc0O/UxwCg9T09 +fqrC2cV1UwkZckw8d7tl+7cD/39P/X30a15SKJWqbQOqjHkS6FVTqS/7Y24n2uDa +5oTp0RqNOQZH8p+xbgMMepvpIF8KHoHIGNbkUGyzRjjpS3SaQbXnQh9fvyycj/ZE +3i9RQwulmEqTrHjZag+tTVUto3L5v3ovcsx/lxuLBHorFPyW7fhu0ucA4uAKwNjI +KgNfBACCKo5HFYLvDoRDmigRGaw8RoIVzRG2XRJDENyFcNm3Vr+YyMgdWWcduuo/ +cOKNZ/ahqidnZ7nZGPZmnyjcNH0eou9eQg8v9sP+v+05uPknqt82OfqVn45iLxpo +Q14kN8g5b6AuL4WxtfSfKFrn599Qyu81jVvxrBqNFVQLClWE67kCDQRKnkD2EAgA +s0Uqq3cgR7Bv1U1pK1sC7B2W4mXOmbB9eX9H028KVrsUolaKzT5wS7+JYp94SeLt +dYKSjQpC1lsfrCs672+5gkgwThBc0GkQ4xAs4G3Qu6G+Gy/TK3Sy5UQHy9px5w/t +lIfcR7TEOFoJC8Tv93YSBTchP7USktel8kV2eeej6nd5JgjVOTMvsRs2p1xVtLL+ +Mx929IdigqPJKkUYQ7BmbiaZ91mpMk0WB+vDclDzSTCb7fMWq4qKdUwUS14lR95x +saQex8KJHyp/i6sJlE2sm8/HS8zKEkXNOK0+U3NaFQqXYhm1w9rsC3vnuaqVWX+P +AFDd69N9QP5Sh1XYgAFH2wADBQf/f6rBSnLAVEBGOkIZA75MIVMU2hxlb0HDsyTJ +2S8k4jlA7O3kudVAdBVHhtcW4uTxxediC1nK+Ok/KI9w/1t1TZBqJdpg5vMxzBJG +GTWDu90bE/84AF2IeIyPO1t6F6tfMS/czsZuIFQAc31V3E18O4RfVIWJ/Sz+8cFs +4hdVMgGOGyqrAcO/dq/AbGIw2Ewrl8hdnakCWvycjC2lwErKTARRhFJTEZuYF02t +kzpETDWECxj5PzowQ/5VAXojNB5S4lANupNKm7bkzKQvVj3QwqO9Ibmsbu8aC7Cb +gnYJ9zl6kKRYC3e0AFN5Jo8azDVna+YiuT6JuievZchJp1u//g== +=ZQ9i +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/49d2ed97daa8b33f.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/49d2ed97daa8b33f.fingerprints new file mode 100644 index 00000000000..3f0a7df83f9 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/3f/49d2ed97daa8b33f.fingerprints @@ -0,0 +1 @@ +eafc1f3b2fced6afd046c7d5734aef3d43509290 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/734aef3d43509290.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/734aef3d43509290.fingerprints new file mode 100644 index 00000000000..3f0a7df83f9 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/734aef3d43509290.fingerprints @@ -0,0 +1 @@ +eafc1f3b2fced6afd046c7d5734aef3d43509290 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/90/eafc1f3b2fced6afd046c7d5734aef3d43509290.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/eafc1f3b2fced6afd046c7d5734aef3d43509290.asc new file mode 100644 index 00000000000..63f464ca629 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/90/eafc1f3b2fced6afd046c7d5734aef3d43509290.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFRZXAUBCACqPBEjQ7si90PYbccyR/K2tg78HzJfmECvmtE9mKaUpAWGkid8 +xvSWNIunJMqMEyAM6lbyGUE/lQX8k0Ap4qk/UIf9vxdFirmlzD1lhfxDls33Y6et +TxpsRP2Rm0f6fW01R3L275FAvHLkQcOUQVoD407Eb3al41sYy6vdRZpdTJ923w9X +ol0a/6G7wueIMNO4TtxLNGSe+WPjtAWmLOl1H2pg2eOcKR2+finbeWpPZPCjR4I1 +CaMcGfdwv/4goI1b/931t0TlKAyGVhCgTa/1DKtRsJazwtw6MQZkE+/8t4JIuSVx +GlOWUrlU2HCbN+eAHj/5/G0suIw0OZpdtNPBABEBAAG5AQ0EVFlcBQEIAL512AsF +fT8EFL4QfomIipsWFyUCcwQbAgAbJ+Tuum+XDBYIVANgNJFbgCNbBwNXTtyQoj7c +dBD6IsP3HCIxZFLKjxFFu6rbHKls8p3gRPhe0xS43B4ym7IKA4xx4xVR3gtvOKWi +lbM4oKjY0EATFGMygEYp1PJoKtD+USi4QYBOXPCg5yt7BSlYp8bSpv4PddNnkPCq +j/KUK0TVCVkBIkYXyMYQxz1ReQwfZ7hyDoZQFuCILSIoDjPCAsoIFpJY1Qe3h+E7 +Wm3elU+sxoUv/d+gulrrfGL0N2kv4tcOEijXrlMo6lfANp5pmhE0LWpGCB4tqzF4 +x8vRWb0/UOtm15MAEQEAAQ== +=Y9i2 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/79f2237f143e7ead.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/79f2237f143e7ead.fingerprints new file mode 100644 index 00000000000..0969b99054c --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/ad/79f2237f143e7ead.fingerprints @@ -0,0 +1 @@ +c668130c58722c9dc1c0fc633f1eb974e7ab9b37 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/b5/6da2b39d3a4085b5.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/b5/6da2b39d3a4085b5.fingerprints new file mode 100644 index 00000000000..04f4be4c760 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/b5/6da2b39d3a4085b5.fingerprints @@ -0,0 +1 @@ +e06a36f67d8c1bd13f1f278d0ca7139cbc7026f9 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/41cd49b4ef5876f9e9f691dabac30622339994c4.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/41cd49b4ef5876f9e9f691dabac30622339994c4.asc new file mode 100644 index 00000000000..b982dc455eb --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/41cd49b4ef5876f9e9f691dabac30622339994c4.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFlMExYBCACmdTDSXPwSJeYbfYvHoDl5C7vx/0+LOTunDGJN38pNQHYQAZnv +Gyoc9ZmChrhLoim7z4ILqmNo8eegknepQ3dGdUij4NVIhR+m+8irayTbsNHvo3UG +9y7eM5tTSjyNYkyk5fAVuT7OhzIzMA+qtc3GRVxNYRKnaHajt+pOSqr+uoDtMG3n +6eAMHCAnhgh5Nd+dCFcNT+syl3zCwolA1wrzGxxOaif+xi5wwXjmF/lAt4PDIuDT +etA2/AqPM4zAC0BtC0iqVgVypjFV3EAexm/g0LNMiG/M/krzwjPq5gf1DY/57jU0 +02FpKd79HmR7bHdc4e2olEf9NlHxfbPXDDsHABEBAAG5AQ0EWUwTFgEIANmMpV3N +K8aLrLgQTyh5++det8C3D3T5tkEdljHOuN31/qdKNge8H6uKH8zXRZsj5pd8adpW +kD4TzIMvzIwzizsGw34O9hf1E2XPoDqvQr39p1sovX3PeDvRJY/7JFNt9DsphVc3 +xWQfNkC7JdMPa6JRiFHd3ynfbQ+wplf4tfaDVn1JXAWp0NSGgMtXfn5i19hHQWjm +RNAKNQLdVn8UczI8XdVM7bS4giDpQMukSyjsjgAo466iRK2+8f8BwIRe1JRvF37B +dnbvTg/dzoi1/E4ukwVJD6YE2LlDwzdGno9KxPlRsuY3nnheVgjbrGJ2XKRJkIk8 +7cMGh41VKw6L4usAEQEAAQ== +=CqY7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/bac30622339994c4.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/bac30622339994c4.fingerprints new file mode 100644 index 00000000000..ab015cedb86 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/c4/bac30622339994c4.fingerprints @@ -0,0 +1 @@ +41cd49b4ef5876f9e9f691dabac30622339994c4 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/0ca7139cbc7026f9.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/0ca7139cbc7026f9.fingerprints new file mode 100644 index 00000000000..04f4be4c760 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/0ca7139cbc7026f9.fingerprints @@ -0,0 +1 @@ +e06a36f67d8c1bd13f1f278d0ca7139cbc7026f9 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/e06a36f67d8c1bd13f1f278d0ca7139cbc7026f9.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/e06a36f67d8c1bd13f1f278d0ca7139cbc7026f9.asc new file mode 100644 index 00000000000..6ff1211b1c0 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/f9/e06a36f67d8c1bd13f1f278d0ca7139cbc7026f9.asc @@ -0,0 +1,26 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGB4oUgBEADRWQgoKgiLh40ItTA9dndbjOrGmkLaYLKLdWYXd384sDA/DNDP +s/Bj4Du0/3JRRW8Ld3P67AqI1Yhpw1kdmqKzd+jcUoYLxEAvh+enYeGIYEMRtKVD +S9vVSJ6jO7DxvY8f0XUCUyvtKd3UgJujCoFrcullo/hQh7pwlxKiLNWANOuC4TD6 +Bx6xZOHGSQbr66NInnhD9KgoVO/ajHqaFIs770XfzPHY54QgVaN+9Lg+tv0A8zUh +33yV6bVa1/v4XYUiJMf18tdMl/juHGDOjPp21uX+J8ma3a1EguPrPWZOdLRZEJQ4 +TgL1nr0LDdxPNHxcAT6ArMtqMFzTHXg2rT0O+XzaNozctf7hCS2XY7BFIO/9p3BN +UFRczvwndtzVUYTjDUWHNU7qtVvUty3rimeuVPoNAe4ZxVK3mNMvfzVPnuafwRE5 +5nI44qVBQPaP/RG/eETB5zysctU5tXOdCSymraEPNf1Mwc95EiRJmRa0SsfztyOu +yRnT5/k1kxP+p/mHBBwgaGKD6QzfBgfM30KF4DGMjGOzCFuIGd9HT+/l1av2W41B +PJj9sZN5Ww7PeFynZY9JYJZ7e7dWx2ogiqvw8iNzY+a1usPj7mcHo4WpOAct+cW+ +g5JLteO9rP6UR5fYCVS+Q9GtKd/Gub2CxsjR7W37y1oJsfJ6Vdrxcvzb/QARAQAB +uQINBGB4oUgBEADAHw3y9mV6AFjp//TLqWIfPJKJNT22xtKoooJ5/LWr3CKFr5JD +7R85UEsk/UXV+Jb0Ix55+3pQIj6MkkQqS69bVInb+U585eX4Jt//hfRpk+WphtxD +3Svsps9qV9i/WftALCszo17jo6iac9UJXAHFwN1SO7Y99F8zudJyZFPTDS0I57Gv +Q0SBKTWT7YSnb+tjVI31/7cVeF6HuLcgZrA+9JYO4vWU/4eSgh+CqIDfy2NgSVik +KgEQP0LtL+a03zgrkIOU6hFC90VJ3Cgs0NCHeFlnbFE/gmmwDrLI531RTEx29LSD +eqFRHtNQV6URjXg7AdcnIgR2FNTzClPQJRWA4xMAqd60QzeJVgvbhJXBMLp2KZon +dn7HWdkLfkKHDuLxbQ4TXUOLVTWHhvmYlufWWArqw8YSkQb0MrM80zjmMXxchh3k +abOj98/1STg2MSNCp6qP0NrbSzF3X0hnDliJJN70JISxrZuKZdL2gcjgqMp+NhoA +m5936Rrz4lb9dJW1/ZrH23Bl+dJ5e2BcjRmazJ+qB9iY/XUbFzDzGJysP6T+qy4A +ErKJXQ1o6RMCJsNidHsAAjdLp0i29kgclEB4uDhh84vNva/IMgOdX6BKnlqRpbQC +YLzefa164symp9qF3H8ate1obnsqK85GVSEmV84JHLi/f6SBvZQkA6SbgQARAQAB +=fzqF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts index 5a91e9dd43d..67420c48a3a 100644 --- a/src/bom-thirdparty/build.gradle.kts +++ b/src/bom-thirdparty/build.gradle.kts @@ -38,13 +38,13 @@ 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("org.ow2.asm:asm:9.6") + api("org.ow2.asm:asm:9.7.1") api("bsf:bsf:2.4.0") api("cglib:cglib-nodep:3.3.0") - api("com.fasterxml.jackson.core:jackson-annotations:2.16.1") - api("com.fasterxml.jackson.core:jackson-core:2.16.1") - api("com.fasterxml.jackson.core:jackson-databind:2.16.1") + api("com.fasterxml.jackson.core:jackson-annotations:2.18.6") + api("com.fasterxml.jackson.core:jackson-core:2.18.6") + api("com.fasterxml.jackson.core:jackson-databind:2.18.6") api("com.fifesoft:rsyntaxtextarea:3.3.4") api("com.formdev:svgSalamander:1.1.4") api("com.github.ben-manes.caffeine:caffeine:2.9.3") @@ -57,18 +57,18 @@ dependencies { api("com.google.errorprone:error_prone_annotations:2.24.0") api("com.helger.commons:ph-commons:10.2.5") api("com.helger:ph-css:6.5.0") - api("com.jayway.jsonpath:json-path:2.8.0") + api("com.jayway.jsonpath:json-path:2.9.0") api("com.miglayout:miglayout-core:5.3") api("com.miglayout:miglayout-swing:5.3") api("com.sun.activation:javax.activation:1.2.0") - api("com.thoughtworks.xstream:xstream:1.4.20") + api("com.thoughtworks.xstream:xstream:1.4.21") api("commons-codec:commons-codec:1.16.0") api("commons-collections:commons-collections:3.2.2") api("commons-io:commons-io:2.15.1") api("commons-lang:commons-lang:2.6") api("commons-logging:commons-logging:1.3.0") api("commons-net:commons-net:3.10.0") - api("dnsjava:dnsjava:2.1.9") + api("dnsjava:dnsjava:3.6.5") api("io.burt:jmespath-core:0.6.0") api("io.burt:jmespath-jackson:0.6.0") api("javax.activation:javax.activation-api:1.2.0") @@ -87,8 +87,8 @@ dependencies { api("org.hamcrest:hamcrest:2.2") { because("ApacheJMeter_junit depends on junit4") } - api("net.minidev:accessors-smart:2.5.0") - api("net.minidev:json-smart:2.5.0") + api("net.minidev:accessors-smart:2.5.2") + api("net.minidev:json-smart:2.5.2") api("net.sf.jtidy:jtidy:r938") api("net.sf.saxon:Saxon-HE:11.6") api("org.apache-extras.beanshell:bsh:2.0b6") @@ -96,7 +96,7 @@ dependencies { api("org.apache.commons:commons-dbcp2:2.9.0") api("org.apache.commons:commons-jexl3:3.2.1") api("org.apache.commons:commons-jexl:2.1.1") - api("org.apache.commons:commons-lang3:3.14.0") + api("org.apache.commons:commons-lang3:3.18.0") api("org.apache.commons:commons-math3:3.6.1") api("org.apache.commons:commons-pool2:2.12.0") api("org.apache.commons:commons-text:1.11.0") @@ -107,14 +107,31 @@ dependencies { api("org.apache.httpcomponents:httpcore-nio:4.4.16") api("org.apache.httpcomponents:httpcore:4.4.16") api("org.apache.httpcomponents:httpmime:4.5.14") - api("org.apache.logging.log4j:log4j-1.2-api:2.22.1") - api("org.apache.logging.log4j:log4j-api:2.22.1") - api("org.apache.logging.log4j:log4j-core:2.22.1") - api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1") + api("org.apache.logging.log4j:log4j-1.2-api:2.25.4") + api("org.apache.logging.log4j:log4j-api:2.25.4") + api("org.apache.logging.log4j:log4j-core:2.25.4") + api("org.apache.logging.log4j:log4j-slf4j-impl:2.25.4") api("org.apache.rat:apache-rat:0.15") - api("org.apache.tika:tika-core:1.28.5") - api("org.apache.tika:tika-parsers:1.28.5") + api("org.apache.tika:tika-core:2.9.4") api("org.apache.velocity:velocity:1.7") + api("org.apache.xmlgraphics:batik-anim:1.17") + api("org.apache.xmlgraphics:batik-awt-util:1.17") + api("org.apache.xmlgraphics:batik-bridge:1.17") + api("org.apache.xmlgraphics:batik-codec:1.17") + api("org.apache.xmlgraphics:batik-constants:1.17") + api("org.apache.xmlgraphics:batik-css:1.17") + api("org.apache.xmlgraphics:batik-dom:1.17") + api("org.apache.xmlgraphics:batik-ext:1.17") + api("org.apache.xmlgraphics:batik-gvt:1.17") + api("org.apache.xmlgraphics:batik-i18n:1.17") + api("org.apache.xmlgraphics:batik-parser:1.17") + api("org.apache.xmlgraphics:batik-script:1.17") + api("org.apache.xmlgraphics:batik-shared-resources:1.17") + api("org.apache.xmlgraphics:batik-svg-dom:1.17") + api("org.apache.xmlgraphics:batik-svggen:1.17") + api("org.apache.xmlgraphics:batik-transcoder:1.17") + api("org.apache.xmlgraphics:batik-util:1.17") + api("org.apache.xmlgraphics:batik-xml:1.17") api("org.apache.xmlgraphics:xmlgraphics-commons:2.9") api("org.apiguardian:apiguardian-api:1.1.2") api("org.bouncycastle:bcmail-jdk15on:1.70") @@ -133,10 +150,16 @@ dependencies { api("org.jodd:jodd-props:5.0.13") api("org.jsoup:jsoup:1.17.1") api("org.mongodb:mongo-java-driver:2.14.3") - api("org.mozilla:rhino:1.7.14") + api("org.mozilla:rhino:1.7.14.1") api("org.neo4j.driver:neo4j-java-driver:4.4.13") - api("org.slf4j:jcl-over-slf4j:1.7.36") - api("org.slf4j:slf4j-api:1.7.36") + api("org.slf4j:jcl-over-slf4j") { + version { strictly("1.7.36") } + because("log4j-slf4j-impl 2.25.x is built against slf4j 1.x") + } + api("org.slf4j:slf4j-api") { + version { strictly("1.7.36") } + because("log4j-slf4j-impl 2.25.x is built against slf4j 1.x") + } api("oro:oro:2.0.8") api("xalan:serializer:2.7.3") api("xalan:xalan:2.7.3") diff --git a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java index 2e38339eaa8..a5025d00191 100644 --- a/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java +++ b/src/components/src/test/java/org/apache/jmeter/assertions/jmespath/TestJMESPathAssertion.java @@ -105,7 +105,7 @@ private static Stream data() { Arguments.of(InvertType.USE_NO_INVERT, "{'one': '1'}", "one", ValidationType.USE_VALIDATION, ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL, "2", ResultType.ERROR, "Unexpected character (''' (code 39)): was expecting double-quote to start field name\n at" - + " [Source: (String)\"{'one': '1'}\"; line: 1, column: 3]"), + + " [Source: (String)\"{'one': '1'}\"; line: 1, column: 2]"), Arguments.of(InvertType.USE_NO_INVERT, "{\"one\": \"\"}", "one", ValidationType.USE_VALIDATION, ComparisonType.USE_NO_REXEG, ResultNullity.EXPECT_NOT_NULL, "1", ResultType.FAILURE, "Value expected to be equal to 1"), diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts index 38fa682e8e6..101ef4b483c 100644 --- a/src/core/build.gradle.kts +++ b/src/core/build.gradle.kts @@ -101,14 +101,9 @@ dependencies { because("Mean, DescriptiveStatistics") } implementation("org.apache.commons:commons-text") - // For some reason JMeter bundles just tika-core and tika-parsers without transitive - // dependencies. So we exclude those implementation("org.apache.tika:tika-core") { isTransitive = false } - runtimeOnly("org.apache.tika:tika-parsers") { - isTransitive = false - } implementation("org.apache.xmlgraphics:xmlgraphics-commons") implementation("org.freemarker:freemarker") implementation("org.jodd:jodd-core") diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java index 946e9c3163e..81f9054ee0d 100644 --- a/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java +++ b/src/core/src/main/java/org/apache/jmeter/gui/action/RawTextSearcher.java @@ -42,6 +42,7 @@ public RawTextSearcher(boolean caseSensitive, String textToSearch) { * {@inheritDoc} */ @Override + @SuppressWarnings("deprecation") public boolean search(List textTokens) { return textTokens.stream() .filter(StringUtils::isNotEmpty) diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java index 73a59b33b49..c7399136dc3 100644 --- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java +++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java @@ -154,6 +154,7 @@ private static JButton makeButtonItemRes(IconToolbarBean iconBean) throws Except return button; } + @SuppressWarnings("deprecation") private static Icon loadIcon(IconToolbarBean iconBean, String iconPath) throws URISyntaxException { final URL imageURL = JMeterUtils.class.getClassLoader().getResource(iconPath); if (imageURL == null) { diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java index 6fc9144ae06..e5508af46b4 100644 --- a/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java +++ b/src/core/src/main/java/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java @@ -52,6 +52,7 @@ public ApdexSummaryConsumer() { } @Override + @SuppressWarnings("deprecation") protected ListResultData createDataResult(String key, ApdexSummaryData data) { Double apdex = getApdex(data); ApdexThresholdsInfo thresholdsInfo = data.getApdexThresholdInfo(); diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index a6b456bff17..b12994c33ce 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -1,25 +1,25 @@ -29901,accessors-smart-2.5.0.jar +30358,accessors-smart-2.5.2.jar 30570,annotations-24.1.0.jar 6806,apiguardian-api-1.1.2.jar -123598,asm-9.6.jar -485898,batik-anim-1.16.jar -424607,batik-awt-util-1.16.jar -704905,batik-bridge-1.16.jar -112371,batik-codec-1.16.jar -8431,batik-constants-1.16.jar -330361,batik-css-1.16.jar -184060,batik-dom-1.16.jar -10239,batik-ext-1.16.jar -192085,batik-gvt-1.16.jar -11464,batik-i18n-1.16.jar -76872,batik-parser-1.16.jar -25198,batik-script-1.16.jar -6665,batik-shared-resources-1.16.jar -232734,batik-svg-dom-1.16.jar -227487,batik-svggen-1.16.jar -129300,batik-transcoder-1.16.jar -127485,batik-util-1.16.jar -33870,batik-xml-1.16.jar +126093,asm-9.7.1.jar +485992,batik-anim-1.17.jar +424429,batik-awt-util-1.17.jar +704814,batik-bridge-1.17.jar +112314,batik-codec-1.17.jar +8436,batik-constants-1.17.jar +330640,batik-css-1.17.jar +184033,batik-dom-1.17.jar +10244,batik-ext-1.17.jar +192067,batik-gvt-1.17.jar +11427,batik-i18n-1.17.jar +76812,batik-parser-1.17.jar +24654,batik-script-1.17.jar +6670,batik-shared-resources-1.17.jar +230456,batik-svg-dom-1.17.jar +227423,batik-svggen-1.17.jar +129208,batik-transcoder-1.17.jar +127142,batik-util-1.17.jar +33826,batik-xml-1.17.jar 113369,bsf-2.4.0.jar 389033,bsh-2.0b6.jar 912143,caffeine-2.9.3.jar @@ -32,7 +32,7 @@ 267634,commons-jexl-2.1.1.jar 462124,commons-jexl3-3.2.1.jar 760623,commons-jvm-4.1.0.jar -657952,commons-lang3-3.14.0.jar +702952,commons-lang3-3.18.0.jar 70816,commons-logging-1.3.0.jar 2213560,commons-math3-3.6.1.jar 322780,commons-net-3.10.0.jar @@ -50,7 +50,7 @@ 353322,datamodel-jvm-4.1.0.jar 98115,dec-0.1.2.jar 95287,deprecated-in-v4-jvm-4.1.0.jar -320748,dnsjava-2.1.9.jar +602322,dnsjava-3.6.5.jar 16829,error_prone_annotations-2.24.0.jar 1736381,freemarker-2.3.32.jar 32359,geronimo-jms_1.1_spec-1.1.1.jar @@ -74,9 +74,9 @@ 855013,httpcore5-5.2.4.jar 237145,httpcore5-h2-5.2.4.jar 41727,httpmime-4.5.14.jar -78480,jackson-annotations-2.16.1.jar -578125,jackson-core-2.16.1.jar -1637611,jackson-databind-2.16.1.jar +78412,jackson-annotations-2.18.6.jar +589904,jackson-core-2.18.6.jar +1659211,jackson-databind-2.18.6.jar 78030,javax.activation-1.2.0.jar 142391,jcharts-0.7.5.jar 16555,jcl-over-slf4j-1.7.36.jar @@ -86,8 +86,8 @@ 220475,jodd-lagarto-5.0.13.jar 19858,jodd-log-5.0.13.jar 26047,jodd-props-5.0.13.jar -277582,json-path-2.8.0.jar -120233,json-smart-2.5.0.jar +276633,json-path-2.9.0.jar +122358,json-smart-2.5.2.jar 473788,jsoup-1.17.1.jar 249924,jtidy-r938.jar 384581,junit-4.13.2.jar @@ -99,10 +99,10 @@ 9964,kotlinx-coroutines-swing-1.7.3.jar 996,lets-plot-batik-4.1.0.jar 996,lets-plot-common-4.1.0.jar -356564,log4j-1.2-api-2.22.1.jar -335001,log4j-api-2.22.1.jar -1900022,log4j-core-2.22.1.jar -24583,log4j-slf4j-impl-2.22.1.jar +359214,log4j-1.2-api-2.25.4.jar +351127,log4j-api-2.25.4.jar +2023860,log4j-core-2.25.4.jar +25388,log4j-slf4j-impl-2.25.4.jar 519087,mail-1.5.0-b01.jar 106949,miglayout-core-5.3.jar 22576,miglayout-swing-5.3.jar @@ -119,7 +119,7 @@ 1283358,plot-builder-jvm-4.1.0.jar 969648,plot-stem-jvm-4.1.0.jar 11640,reactive-streams-1.0.4.jar -1383644,rhino-1.7.14.jar +1389188,rhino-1.7.14.1.jar 1297525,rsyntaxtextarea-3.3.4.jar 5104657,Saxon-HE-11.6.jar 283536,serializer-2.7.3.jar @@ -127,8 +127,7 @@ 320794,svgSalamander-1.1.4.jar 10192,swing-extensions-laf-support-0.1.3.jar 2539,swing-extensions-visual-padding-0.1.3.jar -736051,tika-core-1.28.5.jar -1588025,tika-parsers-1.28.5.jar +744600,tika-core-2.9.4.jar 3455761,xalan-2.7.3.jar 1446149,xercesImpl-2.12.2.jar 220536,xml-apis-1.4.01.jar @@ -137,4 +136,4 @@ 7188,xmlpull-1.1.3.1.jar 1027769,xmlresolver-5.2.1-data.jar 165689,xmlresolver-5.2.1.jar -644649,xstream-1.4.20.jar +646504,xstream-1.4.21.jar diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java index e0528d1c770..af1c36e652d 100644 --- a/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java +++ b/src/functions/src/main/java/org/apache/jmeter/functions/RandomString.java @@ -71,6 +71,7 @@ public RandomString() { /** {@inheritDoc} */ @Override + @SuppressWarnings("deprecation") public String execute(SampleResult previousResult, Sampler currentSampler) throws InvalidVariableException { diff --git a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java index cd7bf6f8510..dacf429e71f 100644 --- a/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java +++ b/src/jorphan/src/main/java/org/apache/jorphan/gui/ObjectTableSorter.java @@ -146,6 +146,7 @@ public ObjectTableSorter fixLastRow() { * @param comparator Column value comparator. * @return this */ + @SuppressWarnings("deprecation") public ObjectTableSorter setValueComparator(int column, Comparator comparator) { invalidate(); valueComparators[column] = ObjectUtils.defaultIfNull(comparator, getDefaultComparator(column)); @@ -183,6 +184,7 @@ protected Comparator getDefaultComparator(int column) { * difference * @return this */ + @SuppressWarnings("deprecation") public ObjectTableSorter setFallbackComparator(Comparator comparator) { invalidate(); fallbackComparator = ObjectUtils.defaultIfNull(comparator, Comparator.comparingInt(Row::getIndex)); diff --git a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java index 78f2a413381..83fd32db023 100644 --- a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java +++ b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java @@ -124,6 +124,7 @@ private String execute(Driver driver, String cypher, Map params, } } + @SuppressWarnings("deprecation") private static SampleResult handleException(SampleResult res, Exception ex) { res.setResponseMessage(ex.toString()); if (ex instanceof Neo4jException) { diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts index 2b1dd7f1aca..9d0a627cbeb 100644 --- a/src/protocol/http/build.gradle.kts +++ b/src/protocol/http/build.gradle.kts @@ -80,12 +80,7 @@ dependencies { testImplementation(testFixtures(projects.src.core)) testImplementation(testFixtures(projects.src.testkitWiremock)) testImplementation("com.github.tomakehurst:wiremock-jre8") - // For some reason JMeter bundles just tika-core and tika-parsers without transitive - // dependencies. So we exclude those implementation("org.apache.tika:tika-core") { isTransitive = false } - runtimeOnly("org.apache.tika:tika-parsers") { - isTransitive = false - } } diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java index 8b67fa1f760..688d4788162 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java @@ -270,7 +270,7 @@ private InetAddress[] customRequestLookup(String host) throws UnknownHostExcepti Lookup lookup = new Lookup(host, Type.A); lookup.setCache(lookupCache); if (timeoutMs > 0) { - resolver.setTimeout(timeoutMs / 1000, timeoutMs % 1000); + resolver.setTimeout(java.time.Duration.ofMillis(timeoutMs)); } lookup.setResolver(resolver); Record[] records = lookup.run(); diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java index f64ba780992..d4ff8e79f47 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java @@ -46,6 +46,7 @@ /** * Utilities to (de)serialize GraphQL request parameters. */ +@SuppressWarnings("deprecation") public final class GraphQLRequestParamUtils { public static final String VARIABLES_FIELD = "variables"; diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/DnsManagerTest.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/DnsManagerTest.java deleted file mode 100644 index 1f52c9c9d71..00000000000 --- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/DnsManagerTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to you under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jmeter.protocol.http.control; - -import org.apache.jmeter.protocol.http.sampler.HTTPSampler; -import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase; -import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory; -import org.apache.jmeter.protocol.http.sampler.ResultAsString; -import org.apache.jmeter.samplers.SampleResult; -import org.apache.jmeter.wiremock.WireMockExtension; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; - -import com.github.tomakehurst.wiremock.WireMockServer; - -@ExtendWith(WireMockExtension.class) -public class DnsManagerTest { - @ParameterizedTest - @MethodSource("org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory#getImplementations") - void badDnsInCustomResolverShouldFailHttpSampler(String httpImplementation, WireMockServer server) { - Assumptions.assumeTrue(!HTTPSamplerFactory.IMPL_JAVA.equals(httpImplementation), - "Java implementation does not support custom DNS resolver yet"); - DNSCacheManager dns = new DNSCacheManager(); - dns.setCustomResolver(true); - dns.addServer("20.0.118.11"); - // By default it uses 3 retries (see org.xbill.DNS.ExtendedResolver#setRetries) - dns.setTimeoutMs(2000); - HTTPSamplerBase http = HTTPSamplerFactory.newInstance(httpImplementation); - http.setDNSResolver(dns); - http.setMethod(HTTPSampler.GET); - http.setPort(server.port()); - http.setDomain("localhost"); - http.setPath("/index.html"); - - http.setRunningVersion(true); - - SampleResult result = http.sample(); - Assertions.assertEquals( - "Non HTTP response message: Failed to resolve host name: localhost", - result.getResponseMessage(), () -> - "HTTP is using a custom DNS resolver, so it must fail resolving localhost \n" + - ResultAsString.toString(result)); - } -} diff --git a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java index 5ad929b5c13..c2f9237f71f 100644 --- a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java +++ b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/util/TestGraphQLRequestParamUtils.java @@ -41,6 +41,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; +@SuppressWarnings("deprecation") class TestGraphQLRequestParamUtils { private static final String OPERATION_NAME = ""; diff --git a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt index 1c23d84a4a5..0041b060aeb 100644 --- a/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt +++ b/src/protocol/http/src/test/kotlin/org/apache/jmeter/protocol/http/control/DNSCacheManagerTest.kt @@ -120,7 +120,7 @@ class DNSCacheManagerTest { fun `Valid DNS resolves and caches with custom resolve true`() { assumeLocalDnsResolverOK() for (dns in VALID_DNS_SERVERS) { - sut.addServer(dns) + sut.addServer(dns.hostString) } sut.isCustomResolver = true sut.timeoutMs = 5000 @@ -134,7 +134,7 @@ class DNSCacheManagerTest { fun `Cache should be used where entries exist`() { assumeLocalDnsResolverOK() for (dns in VALID_DNS_SERVERS) { - sut.addServer(dns) + sut.addServer(dns.hostString) } sut.isCustomResolver = true sut.timeoutMs = 5000 diff --git a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java index 7c23db03a82..05d4ebad5cc 100644 --- a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java +++ b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java @@ -54,6 +54,7 @@ public JDBCSampler() { } @Override + @SuppressWarnings("deprecation") public SampleResult sample(Entry e) { SampleResult res = new SampleResult(); res.setSampleLabel(getName());