Fix intellij not seeing shaded deps of testing-common

conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts

@@ -10,3 +10,11 @@ dependencies {
 
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }
+
+testing {
+  suites.withType(JvmTestSuite::class).configureEach {
+    dependencies {
+      implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
+    }
+  }
+}

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -467,7 +467,7 @@ configurations.configureEach {
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")).using(project(":javaagent-tooling"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-agent-for-testing")).using(project(":testing:agent-for-testing"))
-      substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common"))
+      substitute(module("io.opentelemetry.javaagent:opentelemetry-testing-common")).using(project(":testing-common:with-shaded-dependencies"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-muzzle")).using(project(":muzzle"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent")).using(project(":javaagent"))
     }

instrumentation-annotations-support-testing/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation-annotations-support/build.gradle.kts

@@ -16,6 +16,6 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  testImplementation(project(":testing-common"))
+  testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
 }

instrumentation-api-incubator/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  testImplementation(project(":testing-common"))
+  testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("io.opentelemetry:opentelemetry-sdk")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
   testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")

instrumentation-api/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  testImplementation(project(":testing-common"))
+  testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
   testImplementation("io.opentelemetry:opentelemetry-exporter-common")
   testImplementation("org.junit-pioneer:junit-pioneer")

instrumentation/alibaba-druid-1.0/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   api("org.mockito:mockito-core")
   api("org.mockito:mockito-junit-jupiter")
 

instrumentation/apache-dbcp-2.0/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   api("org.mockito:mockito-core")
   api("org.mockito:mockito-junit-jupiter")
 

instrumentation/apache-dubbo-2.7/testing/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 val apacheDubboVersion = "2.7.5"
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("org.apache.dubbo:dubbo:$apacheDubboVersion")
   api("org.apache.dubbo:dubbo-config-api:$apacheDubboVersion")

instrumentation/apache-httpclient/apache-httpclient-4.3/testing/build.gradle.kts

@@ -13,7 +13,7 @@ tasks {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("org.apache.httpcomponents:httpclient:4.3")
 

instrumentation/armeria/armeria-1.3/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("com.linecorp.armeria:armeria:1.3.0")
   api("com.linecorp.armeria:armeria-junit4:1.3.0")

instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("com.amazonaws:aws-lambda-java-core:1.0.0")
 

instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("com.amazonaws:aws-lambda-java-core:1.0.0")
   api("com.amazonaws:aws-lambda-java-events:2.2.1")

instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("com.amazonaws:aws-java-sdk-core:1.11.0")
 

instrumentation/aws-sdk/aws-sdk-2.2/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("software.amazon.awssdk:apache-client:2.2.0")
   // older versions don't play nice with armeria http server

instrumentation/build.gradle.kts

@@ -20,13 +20,6 @@ subprojects {
     instrumentationProjectTest.configure {
       dependsOn(subProj.tasks.named("test"))
     }
-
-    // this only exists to make Intellij happy since it doesn't (currently at least) understand our
-    // inclusion of this artifact inside :testing-common
-    dependencies {
-      compileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
-      testCompileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
-    }
   }
 
   plugins.withId("io.opentelemetry.instrumentation.muzzle-check") {

instrumentation/c3p0-0.9/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   api("org.mockito:mockito-core")
   api("org.mockito:mockito-junit-jupiter")
 

instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   compileOnly("com.datastax.oss:java-driver-core:4.0.0")
   implementation("org.testcontainers:testcontainers")

instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   compileOnly("com.datastax.oss:java-driver-core:4.4.0")
   implementation("io.projectreactor:reactor-core:3.5.3")

instrumentation/couchbase/couchbase-common/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("com.couchbase.mock:CouchbaseMock:1.5.19")
   // Earliest version that seems to allow queries with CouchbaseMock:

instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   implementation("org.elasticsearch.client:transport:6.0.0")
   implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))

instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts

@@ -6,5 +6,5 @@ dependencies {
   compileOnly("org.elasticsearch.client:transport:5.3.0")
   compileOnly("org.elasticsearch:elasticsearch:5.3.0")
 
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation/executors/testing/build.gradle.kts

@@ -5,5 +5,5 @@ plugins {
 dependencies {
   api("org.junit.jupiter:junit-jupiter-api")
 
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation/graphql-java/graphql-java-common/testing/build.gradle.kts

@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("com.graphql-java:graphql-java:12.0")
 }

instrumentation/grpc-1.6/testing/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 val grpcVersion = "1.6.0"
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("io.grpc:grpc-core:$grpcVersion")
   api("io.grpc:grpc-protobuf:$grpcVersion")

instrumentation/helidon-4.3/testing/build.gradle.kts

@@ -7,6 +7,6 @@ otelJava {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("io.helidon.webserver:helidon-webserver:4.3.0")
 }

instrumentation/hibernate/hibernate-reactive-1.0/hibernate-reactive-2.0-testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("org.testcontainers:testcontainers")
 
   compileOnly("org.hibernate.reactive:hibernate-reactive-core:2.0.0.Final")

instrumentation/hibernate/testing/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation/hikaricp-3.0/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   api("org.mockito:mockito-core")
   api("org.mockito:mockito-junit-jupiter")
 

instrumentation/java-http-client/testing/build.gradle.kts

@@ -7,5 +7,5 @@ otelJava {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation/java-http-server/testing/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   compileOnly("javax:javaee-api:7.0")
 
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("io.opentelemetry:opentelemetry-api")
 
   val arquillianVersion = "1.7.0.Alpha10"

instrumentation/jaxrs/jaxrs-common/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.slf4j:slf4j-api")

instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   compileOnly("javax:javaee-api:7.0")
 
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.jsoup:jsoup:1.13.1")
 

instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts

@@ -22,5 +22,5 @@ dependencies {
   api("org.eclipse.jetty:jetty-webapp:9.4.35.v20201120")
   api("org.springframework.ws:spring-ws-core:3.0.0.RELEASE")
 
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts

@@ -22,5 +22,5 @@ dependencies {
   api("org.eclipse.jetty:jetty-webapp:11.0.17")
   api("org.springframework.ws:spring-ws-core:4.0.0")
 
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
 }

instrumentation/jdbc/testing/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   api("com.google.guava:guava")
 
   compileOnly("com.h2database:h2:1.3.169")

instrumentation/jedis/jedis-1.4/testing/build.gradle.kts

@@ -4,6 +4,6 @@ plugins {
 
 dependencies {
   compileOnly("redis.clients:jedis:1.4.0")
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("org.testcontainers:testcontainers")
 }

instrumentation/jetty-httpclient/jetty-httpclient-12.0/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("org.eclipse.jetty:jetty-client:12.0.0")
 

instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 val jettyVers_base9 = "9.2.0.v20140526"
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   api("org.eclipse.jetty:jetty-client:$jettyVers_base9")
 

instrumentation/jmx-metrics/library/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 dependencies {
   implementation("org.snakeyaml:snakeyaml-engine")
 
-  testImplementation(project(":testing-common"))
+  testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("org.testcontainers:testcontainers")
 
   testImplementation("org.testcontainers:testcontainers-junit-jupiter")

instrumentation/jsf/jsf-jakarta-common/testing/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
   api("org.eclipse.jetty:apache-jstl:11.0.0")
   api("org.eclipse.jetty:apache-jsp:11.0.0")
 
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("org.jsoup:jsoup:1.13.1")
 
   implementation("org.glassfish:jakarta.el:4.0.2")

instrumentation/jsf/jsf-javax-common/testing/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
   compileOnly("jakarta.faces:jakarta.faces-api:2.3.2")
   compileOnly("jakarta.el:jakarta.el-api:3.0.3")
 
-  implementation(project(":testing-common"))
+  implementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   implementation("org.jsoup:jsoup:1.13.1")
 
   val jettyVersion = "9.4.35.v20201120"

instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":testing-common"))
+  api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
   implementation("org.apache.kafka:kafka-clients:0.11.0.0")
 

instrumentation/kafka/kafka-connect-2.6/testing/build.gradle.kts

@@ -12,7 +12,7 @@ val agentShadowJar = project(":javaagent").tasks.named<ShadowJar>("shadowJar")
 
 dependencies {
   testImplementation(project(":smoke-tests"))
-  testImplementation(project(":testing-common"))
+  testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
   testImplementation("org.apache.kafka:kafka-clients:3.6.1")
   testImplementation("io.opentelemetry:opentelemetry-exporter-logging")