apache · vlsi · Jan 10, 2023 · Jan 10, 2023
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -610,6 +610,11 @@ allprojects {
                 passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
                 passProperty("junit.jupiter.execution.parallel.enabled", "true")
                 passProperty("junit.jupiter.execution.timeout.default", "2 m")
+                // Spock tests use cglib proxies that access ClassLoader.defineClass reflectively
+                // See https://github.com/apache/jmeter/pull/5763
+                if (JavaVersion.current().isJava9Compatible) {
+                    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+                }
             }
             withType<SpotBugsTask>().configureEach {
                 group = LifecycleBasePlugin.VERIFICATION_GROUP

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -39,8 +39,6 @@ fun Project.applyKotlinProjectConventions() {
     apply(plugin = "org.gradle.kotlin.kotlin-dsl")
 
     tasks.withType<KotlinCompile> {
-        sourceCompatibility = "unused"
-        targetCompatibility = "unused"
         kotlinOptions {
             jvmTarget = "1.8"
         }

diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
@@ -8,6 +8,7 @@
     <trusted-key id='160a7a9cf46221a56b06ad64461a804f2609fd89' group='com.github.shyiko.klob' />
     <trusted-key id='7616eb882daf57a11477aaf559a252fb1199d873' group='com.google.code.findbugs' />
     <trusted-key id='afcc4c7594d09e2182c60e0f7a01b0f236e5430f' group='com.google.code.gson' />
+    <trusted-key id='c7be5bcc9fec15518cfda882b0f3710fa64900e7' group='com.google.code.gson' />
     <trusted-key id='7615ad56144df2376f49d98b1669c4bb543e0445' group='com.google.errorprone' />
     <trusted-key id='694621a7227d8d5289699830abe9f3126bb741c1' group='com.google.guava' />
     <trusted-key id='bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae' group='com.google.guava' />
@@ -22,6 +23,7 @@
     <trusted-key id='1fa37fbe4453c1073e7ef61d6449005f96bc97a3' group='de.undercouch' />
     <trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='info.picocli' />
     <trusted-key id='d4c89ea4aaf455fd88b22087efe8086f9e93774e' group='junit' />
+    <trusted-key id='fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd' group='net.java.dev.jna' />
     <trusted-key id='124dac8350968ec2a8260584ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='a778fde933a96dda827840d8e2b3d84202b812d9' group='org.assertj' />
     <trusted-key id='08f0aab4d0c1a4bdde340765b341ddb020fcb6ab' group='org.bouncycastle' />
@@ -40,5 +42,14 @@
     <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.1.7'>
       <sha512>2FE2FE885E48F7D3592751F0E824E21BE2478B9046E25E0AF109E6683F126B1ACE3DA7CB0FF3DA586C08498EF9FEFF445A00A63B2B86CC8BE22D0B3242F801B8</sha512>
     </dependency>
+    <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins' version='2.4.1'>
+      <sha512>438E982D2C40426C18E4953AFA3A88A6A5BB69D37D11A60CFF03F28E8ACABD1009B5F10D07D99F61470DDDE194F489EA01425BB4D3AF798B10A2954E6D0ED095</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin' version='1.7.10'>
+      <sha512>CB887D0053A5C1656260BC77003BCAE612CAA018933CB7A752EC2A87AB571EA0CD683905436771ED1982A8DDE15299F861C513CC73A83E1C0F31F1154095D11D</sha512>
+    </dependency>
+    <dependency group='org.jetbrains.kotlin' module='kotlin-sam-with-receiver' version='1.7.10'>
+      <sha512>5A1FF4989B370946633B6BB2BE9E42729AE8CA323D59444F149EAB1AFC199AEED8ADC35199C672DB153AAA7D8E670C2FD9A9B78A36EC02130A342999943EB4B9</sha512>
+    </dependency>
   </dependencies>
 </dependency-verification>
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/d4/7892707e9657ebd4.fingerprints
@@ -0,0 +1 @@
+c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/dd/15c71c0a4e0b8edd.fingerprints
@@ -0,0 +1 @@
+fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/...hecksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc b/...hecksum-dependency-plugin/cached-pgp-keys/dd/fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe
+20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube
+y5M9gIc0yCynC4Cnmg2DmRWuafVvqogz0vDKUG3ADvPgRyaItzh0xO/PsWPZvIHD
+SlCX9Ny/RT1vZ741tBUm1flGUzxs0zAPt0I+ievjwOeKw8OeUb59sc98U3XpVOVQ
+KDD6RIzhnvronznoPkcKPGMrVgBbgyP1/6rwn1u/69CTlED+lyWervseGtDQCO4h
+nVZGTfLLo3cB1ertknmmMqyahfaQcohykvAmVzxxkzaWE1vSkOX1U2bFaUNiYuZN
+U8zJtdENX2isKQp4xSxJ1/+/hjyfrGwLAebtvnwNcsM3oDwHoevusMoLmMNGkGe0
+yLjz38gwLCIuVrSFeHtHJKdPPsnWVsA65o3iCQyEO5lp38cjDE1hkHzXGO34LiPX
+AlDHU2YzoWvAHPqSppppjPJmz1tgHqx146tukezuzoRXuEUTmDAjbpLEHxvKQuBr
+DcSfWqe4zfKKqH/CfhxlPGilUcVyLmhaHjs1ti1Bnj4YmQuWo9BR3rPdLi1gQFlp
+wZfzytmmK6Zy4Ek89la7cgt6AF3eXjNmpVtGZlAb7lr3xne9DTp98IW3iwARAQAB
+uQINBFcyNOoBEADH4HSIjsu94/e0zGBJbyrFFCE8ISGTI7HANfUQeL0Cpl7EbpQN
+jIGFbEtvdPheeaz5hJ5sg3dt/og3fQ9oBAXkkx65XmRnsLwYud5uI4bS240UV+HX
+DBBAVTE/luQfIp6CWImSY3dpfSRZWarXkU3vDtZgj3drSrY8DbLBPU6B9e7QqToy
+3qmZQ9/VN7QEXR+AyNDR2ajEbCzhkWyvXD+7VJg+lzhDnzepIxmDmpbiwmsT9J1i
++BoG8FrN++ZRVXaOEslARP0+rvpIK6RZG9wdBtb09RJODBnufyprYP0//GmcZyOZ
+CbyLBfJqOI7vUYu78xyBcbwQgbulwMop3sN/IgxCTGFY4R4waHmgfMdagBNobCv5
+bjODfegAeKmI/Tmg4sppfH31+YahntYZ+MZCxgbCWRpODut6JlZ/KW015I/BAjrx
+cj/WooDMxGgq87SAYF6+Kl/Zm4eNp8emduIfLQguZymAryzWQixWwZFfkis/DVYA
+OhZWYvlXao1RPAMMHFhht+578atKpJYzMca6WzGX5TuLSip2tXRR5Y8k7vWMVEQa
+TlQyHQAl3jw62Sc4WI7u7vA3edbW++1wH8kQvoHTIjdUHpGEkGiNDuVi2dlr0LH1
+yEoVyoZYu+sSeRhBKezHtPsOd02iVBevJIXpnVA9z/FlTEOBfcz4oFKyiQARAQAB
+=RUvE
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/e7/b0f3710fa64900e7.fingerprints
@@ -0,0 +1 @@
+c7be5bcc9fec15518cfda882b0f3710fa64900e7
diff --git a/...hecksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc b/...hecksum-dependency-plugin/cached-pgp-keys/e7/c7be5bcc9fec15518cfda882b0f3710fa64900e7.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H
+hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7
+cAzKE+iKWbLLwfhRn1iuC7s5l1NLPsh44IUt3xDaFXNQrPO5OnRz8bqsGFVawxmu
+2bPqIjkhxEiYpxwaZZbDkgBR6rbBth6A7QOadQcj/9wNdekoM9dyg+olOUmnLrtA
+nMBhrvvbm2fZxTps3SZHlLV7+iSu71B5SqU/kT54/49n8vxrQiGvzp9K+t7c7EP2
+w4Ax1nYpRkCxYdHOX3YBdayUiP9ZaYH/YHtLABEBAAG5AQ0EV1tJ8gEIAJVavNan
+4WxxlwLwvnBj3/wcEWqN+kfMHENMSjmRWOYSmC332hhGLmTDi++BPWt2OOvHUusJ
+V8dZP5D9yUBRFsKozIpyXyS76C5VYGMY8WZ6kyqn/mLCiwmnkOJ24kXLaaHPsQjv
+6i5f2KliDVhAGUHmNMJgH8o/GL7zZ03Mb8ZlKFZobp0dn+/lxoOtQSzR+cBz8NvM
+BkOKD8r4PJA6BxCR1HVEHsq4xSnjr/UZOYvh+Kaxfnop7Rn9in5MoY2rCY+PV59X
+bx4grqNpjupyHEf1MHodJRj85JiClnLZk7dNJ/kr+zggwbsd12/GHkBt/pxuWhe0
+eFcAOJmvqC3c4pUAEQEAAQ==
+=Hn4p
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints b/buildSrc/gradle/checksum-dependency-plugin/cached-pgp-keys/fe/891e4c2d471515fe.fingerprints
@@ -0,0 +1 @@
+fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,8 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists