Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-leftovers

Author: SylvainJuge

dependencyManagement/build.gradle.kts

@@ -90,7 +90,7 @@ val DEPENDENCIES = listOf(
   "com.uber.nullaway:nullaway:0.12.3",
   "commons-beanutils:commons-beanutils:1.10.0",
   "commons-cli:commons-cli:1.9.0",
-  "commons-codec:commons-codec:1.17.2",
+  "commons-codec:commons-codec:1.18.0",
   "commons-collections:commons-collections:3.2.2",
   "commons-digester:commons-digester:2.1",
   "commons-fileupload:commons-fileupload:1.5",

instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts

@@ -29,8 +29,11 @@ testing {
   suites {
     val version35Test by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("org.hsqldb:hsqldb:2.3.4")
+        // this only exists to make Intellij happy since it doesn't (currently at least) understand our
+        // inclusion of this artifact inside :testing-common
+        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
 
+        implementation("org.hsqldb:hsqldb:2.3.4")
         compileOnly("io.vertx:vertx-codegen:$vertxVersion")
         implementation("io.vertx:vertx-web:$vertxVersion")
         implementation("io.vertx:vertx-rx-java2:$vertxVersion")
@@ -42,8 +45,11 @@ testing {
 
     val latestDepTest by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("org.hsqldb:hsqldb:2.3.4")
+        // this only exists to make Intellij happy since it doesn't (currently at least) understand our
+        // inclusion of this artifact inside :testing-common
+        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
 
+        implementation("org.hsqldb:hsqldb:2.3.4")
         implementation("io.vertx:vertx-web:latest.release")
         implementation("io.vertx:vertx-rx-java2:latest.release")
         implementation("io.vertx:vertx-web-client:latest.release")