Base version in module names

Author: trask

settings.gradle.kts

@@ -183,20 +183,20 @@ include(":instrumentation:cassandra:cassandra-4.0:javaagent")
 include(":instrumentation:cassandra:cassandra-4.4:javaagent")
 include(":instrumentation:cassandra:cassandra-4.4:library")
 include(":instrumentation:cassandra:cassandra-4.4:testing")
-include(":instrumentation:cassandra:cassandra-4-common:testing")
+include(":instrumentation:cassandra:cassandra-common-4.0:testing")
 include(":instrumentation:cdi-testing")
 include(":instrumentation:clickhouse-client-0.5:javaagent")
 include(":instrumentation:couchbase:couchbase-2.0:javaagent")
 include(":instrumentation:couchbase:couchbase-2.6:javaagent")
-include(":instrumentation:couchbase:couchbase-2-common:javaagent")
-include(":instrumentation:couchbase:couchbase-2-common:javaagent-unit-tests")
+include(":instrumentation:couchbase:couchbase-common-2.0:javaagent")
+include(":instrumentation:couchbase:couchbase-common-2.0:javaagent-unit-tests")
 include(":instrumentation:couchbase:couchbase-3.1:javaagent")
 include(":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded")
 include(":instrumentation:couchbase:couchbase-3.1.6:javaagent")
 include(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded")
 include(":instrumentation:couchbase:couchbase-3.2:javaagent")
 include(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded")
-include(":instrumentation:couchbase:couchbase-common:testing")
+include(":instrumentation:couchbase:couchbase-common-2.0:testing")
 include(":instrumentation:dropwizard:dropwizard-metrics-4.0:javaagent")
 include(":instrumentation:dropwizard:dropwizard-testing")
 include(":instrumentation:dropwizard:dropwizard-views-0.7:javaagent")
@@ -206,14 +206,14 @@ include(":instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-6.4:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-7.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-7.0:library")
-include(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent")
-include(":instrumentation:elasticsearch:elasticsearch-rest-common:library")
+include(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent")
+include(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:library")
 include(":instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-transport-5.3:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-transport-6.0:testing")
-include(":instrumentation:elasticsearch:elasticsearch-transport-common:javaagent")
-include(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")
+include(":instrumentation:elasticsearch:elasticsearch-transport-common-5.0:javaagent")
+include(":instrumentation:elasticsearch:elasticsearch-transport-common-5.0:testing")
 include(":instrumentation:executors:bootstrap")
 include(":instrumentation:executors:javaagent")
 include(":instrumentation:executors:jdk21-testing")
@@ -229,8 +229,8 @@ include(":instrumentation:graphql-java:graphql-java-12.0:javaagent")
 include(":instrumentation:graphql-java:graphql-java-12.0:library")
 include(":instrumentation:graphql-java:graphql-java-20.0:javaagent")
 include(":instrumentation:graphql-java:graphql-java-20.0:library")
-include(":instrumentation:graphql-java:graphql-java-common:library")
-include(":instrumentation:graphql-java:graphql-java-common:testing")
+include(":instrumentation:graphql-java:graphql-java-common-12.0:library")
+include(":instrumentation:graphql-java:graphql-java-common-12.0:testing")
 include(":instrumentation:grizzly-2.3:javaagent")
 include(":instrumentation:grpc-1.6:javaagent")
 include(":instrumentation:grpc-1.6:library")
@@ -242,7 +242,7 @@ include(":instrumentation:hibernate:hibernate-3.3:javaagent")
 include(":instrumentation:hibernate:hibernate-4.0:javaagent")
 include(":instrumentation:hibernate:hibernate-6.0:javaagent")
 include(":instrumentation:hibernate:hibernate-6.0:spring-testing")
-include(":instrumentation:hibernate:hibernate-common:javaagent")
+include(":instrumentation:hibernate:hibernate-common-3.3:javaagent")
 include(":instrumentation:hibernate:hibernate-procedure-call-4.3:javaagent")
 include(":instrumentation:hibernate:hibernate-reactive-1.0:javaagent")
 include(":instrumentation:hikaricp-3.0:javaagent")
@@ -316,11 +316,11 @@ include(":instrumentation:jedis:jedis-1.4:javaagent")
 include(":instrumentation:jedis:jedis-1.4:testing")
 include(":instrumentation:jedis:jedis-3.0:javaagent")
 include(":instrumentation:jedis:jedis-4.0:javaagent")
-include(":instrumentation:jedis:jedis-common:javaagent")
+include(":instrumentation:jedis:jedis-common-1.4:javaagent")
 include(":instrumentation:jetty:jetty-8.0:javaagent")
 include(":instrumentation:jetty:jetty-11.0:javaagent")
 include(":instrumentation:jetty:jetty-12.0:javaagent")
-include(":instrumentation:jetty:jetty-common:javaagent")
+include(":instrumentation:jetty:jetty-common-8.0:javaagent")
 include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:javaagent")
 include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:library")
 include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing")
@@ -329,17 +329,17 @@ include(":instrumentation:jetty-httpclient:jetty-httpclient-12.0:library")
 include(":instrumentation:jetty-httpclient:jetty-httpclient-12.0:testing")
 include(":instrumentation:jms:jms-1.1:javaagent")
 include(":instrumentation:jms:jms-3.0:javaagent")
-include(":instrumentation:jms:jms-common:bootstrap")
-include(":instrumentation:jms:jms-common:javaagent")
-include(":instrumentation:jms:jms-common:javaagent-unit-tests")
+include(":instrumentation:jms:jms-common-1.1:bootstrap")
+include(":instrumentation:jms:jms-common-1.1:javaagent")
+include(":instrumentation:jms:jms-common-1.1:javaagent-unit-tests")
 include(":instrumentation:jmx-metrics:javaagent")
 include(":instrumentation:jmx-metrics:library")
 include(":instrumentation:jodd-http-4.2:javaagent")
 include(":instrumentation:jodd-http-4.2:javaagent-unit-tests")
-include(":instrumentation:jsf:jsf-jakarta-common:javaagent")
-include(":instrumentation:jsf:jsf-jakarta-common:testing")
-include(":instrumentation:jsf:jsf-javax-common:javaagent")
-include(":instrumentation:jsf:jsf-javax-common:testing")
+include(":instrumentation:jsf:jsf-3.0:javaagent")
+include(":instrumentation:jsf:jsf-3.0:testing")
+include(":instrumentation:jsf:jsf-2.3:javaagent")
+include(":instrumentation:jsf:jsf-2.3:testing")
 include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")
 include(":instrumentation:jsf:jsf-mojarra-3.0:javaagent")
 include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
@@ -349,7 +349,7 @@ include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:bootstrap")
 include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:javaagent")
 include(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:testing")
 include(":instrumentation:kafka:kafka-clients:kafka-clients-2.6:library")
-include(":instrumentation:kafka:kafka-clients:kafka-clients-common:library")
+include(":instrumentation:kafka:kafka-clients:kafka-clients-common-0.11:library")
 include(":instrumentation:kafka:kafka-streams-0.11:javaagent")
 include(":instrumentation:kotlinx-coroutines:kotlinx-coroutines-1.0:javaagent")
 include(":instrumentation:kotlinx-coroutines:kotlinx-coroutines-flow-1.3:javaagent")
@@ -358,19 +358,19 @@ include(":instrumentation:ktor:ktor-1.0:library")
 include(":instrumentation:ktor:ktor-2.0:javaagent")
 include(":instrumentation:ktor:ktor-2.0:library")
 include(":instrumentation:ktor:ktor-2.0:testing")
-include(":instrumentation:ktor:ktor-2-common:library")
+include(":instrumentation:ktor:ktor-common-2.0:library")
 include(":instrumentation:ktor:ktor-3.0:javaagent")
 include(":instrumentation:ktor:ktor-3.0:library")
 include(":instrumentation:ktor:ktor-3.0:testing")
-include(":instrumentation:ktor:ktor-common:library")
+include(":instrumentation:ktor:ktor-common-1.0:library")
 include(":instrumentation:kubernetes-client-7.0:javaagent")
 include(":instrumentation:kubernetes-client-7.0:javaagent-unit-tests")
 include(":instrumentation:lettuce:lettuce-4.0:javaagent")
 include(":instrumentation:lettuce:lettuce-5.0:javaagent")
 include(":instrumentation:lettuce:lettuce-5.1:javaagent")
 include(":instrumentation:lettuce:lettuce-5.1:library")
 include(":instrumentation:lettuce:lettuce-5.1:testing")
-include(":instrumentation:lettuce:lettuce-common:library")
+include(":instrumentation:lettuce:lettuce-common-5.0:library")
 include(":instrumentation:liberty:compile-stub")
 include(":instrumentation:liberty:liberty-20.0:javaagent")
 include(":instrumentation:liberty:liberty-dispatcher-20.0:javaagent")
@@ -380,7 +380,7 @@ include(":instrumentation:log4j:log4j-appender-2.17:library")
 include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.7:javaagent")
 include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent")
 include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:library-autoconfigure")
-include(":instrumentation:log4j:log4j-context-data:log4j-context-data-common:testing")
+include(":instrumentation:log4j:log4j-context-data:log4j-context-data-common-2.7:testing")
 include(":instrumentation:log4j:log4j-mdc-1.2:javaagent")
 include(":instrumentation:logback:logback-appender-1.0:javaagent")
 include(":instrumentation:logback:logback-appender-1.0:library")
@@ -397,16 +397,16 @@ include(":instrumentation:mongo:mongo-3.1:testing")
 include(":instrumentation:mongo:mongo-3.7:javaagent")
 include(":instrumentation:mongo:mongo-4.0:javaagent")
 include(":instrumentation:mongo:mongo-async-3.3:javaagent")
-include(":instrumentation:mongo:mongo-common:testing")
+include(":instrumentation:mongo:mongo-common-3.1:testing")
 include(":instrumentation:mybatis-3.2:javaagent")
 include(":instrumentation:netty:netty-3.8:javaagent")
 include(":instrumentation:netty:netty-4.0:javaagent")
 include(":instrumentation:netty:netty-4.1:javaagent")
 include(":instrumentation:netty:netty-4.1:library")
 include(":instrumentation:netty:netty-4.1:testing")
-include(":instrumentation:netty:netty-4-common:javaagent")
-include(":instrumentation:netty:netty-4-common:library")
-include(":instrumentation:netty:netty-common:library")
+include(":instrumentation:netty:netty-common-4.0:javaagent")
+include(":instrumentation:netty:netty-common-4.0:library")
+include(":instrumentation:netty:netty-common-3.8:library")
 include(":instrumentation:okhttp:okhttp-2.2:javaagent")
 include(":instrumentation:okhttp:okhttp-3.0:javaagent")
 include(":instrumentation:okhttp:okhttp-3.0:library")
@@ -444,15 +444,15 @@ include(":instrumentation:play:play-mvc:play-mvc-2.6:javaagent")
 include(":instrumentation:play:play-ws:play-ws-1.0:javaagent")
 include(":instrumentation:play:play-ws:play-ws-2.0:javaagent")
 include(":instrumentation:play:play-ws:play-ws-2.1:javaagent")
-include(":instrumentation:play:play-ws:play-ws-common:javaagent")
-include(":instrumentation:play:play-ws:play-ws-common:testing")
+include(":instrumentation:play:play-ws:play-ws-common-1.0:javaagent")
+include(":instrumentation:play:play-ws:play-ws-common-1.0:testing")
 include(":instrumentation:powerjob-4.0:javaagent")
 include(":instrumentation:pulsar:pulsar-2.8:javaagent")
 include(":instrumentation:pulsar:pulsar-2.8:javaagent-unit-tests")
-include(":instrumentation:quarkus-resteasy-reactive:common-testing")
-include(":instrumentation:quarkus-resteasy-reactive:javaagent")
-include(":instrumentation:quarkus-resteasy-reactive:quarkus2-testing")
-include(":instrumentation:quarkus-resteasy-reactive:quarkus3-testing")
+include(":instrumentation:quarkus-resteasy-reactive-1.11:common-testing")
+include(":instrumentation:quarkus-resteasy-reactive-1.11:javaagent")
+include(":instrumentation:quarkus-resteasy-reactive-1.11:quarkus2-testing")
+include(":instrumentation:quarkus-resteasy-reactive-1.11:quarkus3-testing")
 include(":instrumentation:quartz-2.0:javaagent")
 include(":instrumentation:quartz-2.0:library")
 include(":instrumentation:quartz-2.0:testing")
@@ -477,8 +477,8 @@ include(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent-unit
 include(":instrumentation:rediscala-1.8:javaagent")
 include(":instrumentation:redisson:redisson-3.0:javaagent")
 include(":instrumentation:redisson:redisson-3.17:javaagent")
-include(":instrumentation:redisson:redisson-common:javaagent")
-include(":instrumentation:redisson:redisson-common:testing")
+include(":instrumentation:redisson:redisson-common-3.0:javaagent")
+include(":instrumentation:redisson:redisson-common-3.0:testing")
 include(":instrumentation:resources:library")
 include(":instrumentation:restlet:restlet-1.1:javaagent")
 include(":instrumentation:restlet:restlet-1.1:library")
@@ -506,8 +506,8 @@ include(":instrumentation:rxjava:rxjava-3.0:javaagent")
 include(":instrumentation:rxjava:rxjava-3.0:library")
 include(":instrumentation:rxjava:rxjava-3.1.1:javaagent")
 include(":instrumentation:rxjava:rxjava-3.1.1:library")
-include(":instrumentation:rxjava:rxjava-3-common:library")
-include(":instrumentation:rxjava:rxjava-3-common:testing")
+include(":instrumentation:rxjava:rxjava-common-3.0:library")
+include(":instrumentation:rxjava:rxjava-common-3.0:testing")
 include(":instrumentation:scala-fork-join-2.8:javaagent")
 include(":instrumentation:servlet:servlet-2.2:javaagent")
 include(":instrumentation:servlet:servlet-3.0:javaagent")
@@ -519,9 +519,9 @@ include(":instrumentation:servlet:servlet-5.0:jetty11-testing")
 include(":instrumentation:servlet:servlet-5.0:jetty12-testing")
 include(":instrumentation:servlet:servlet-5.0:testing")
 include(":instrumentation:servlet:servlet-5.0:tomcat-testing")
-include(":instrumentation:servlet:servlet-common:bootstrap")
-include(":instrumentation:servlet:servlet-common:javaagent")
-include(":instrumentation:servlet:servlet-javax-common:javaagent")
+include(":instrumentation:servlet:servlet-common-2.2:bootstrap")
+include(":instrumentation:servlet:servlet-common-2.2:javaagent")
+include(":instrumentation:servlet:servlet-common-javax:javaagent") // need a different name since
 include(":instrumentation:spark-2.3:javaagent")
 include(":instrumentation:spring:spring-batch-3.0:javaagent")
 include(":instrumentation:spring:spring-boot-actuator-autoconfigure-2.0:javaagent")
@@ -531,12 +531,12 @@ include(":instrumentation:spring:spring-boot-resources:javaagent-unit-tests")
 include(":instrumentation:spring:spring-cloud-aws-3.0:javaagent")
 include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-2.0:javaagent")
 include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-2.2:testing")
-include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-common:testing")
+include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-common-2.0:testing")
 include(":instrumentation:spring:spring-core-2.0:javaagent")
 include(":instrumentation:spring:spring-data:spring-data-1.8:javaagent")
 include(":instrumentation:spring:spring-data:spring-data-3.0:testing")
 include(":instrumentation:spring:spring-data:spring-data-3.0:kotlin-testing")
-include(":instrumentation:spring:spring-data:spring-data-common:testing")
+include(":instrumentation:spring:spring-data:spring-data-common-1.8:testing")
 include(":instrumentation:spring:spring-integration-4.1:javaagent")
 include(":instrumentation:spring:spring-integration-4.1:library")
 include(":instrumentation:spring:spring-integration-4.1:testing")
@@ -565,8 +565,8 @@ include(":instrumentation:spring:spring-webmvc:spring-webmvc-3.1:wildfly-testing
 include(":instrumentation:spring:spring-webmvc:spring-webmvc-5.3:library")
 include(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:javaagent")
 include(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library")
-include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:javaagent")
-include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:testing")
+include(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:javaagent")
+include(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:testing")
 include(":instrumentation:spring:spring-ws-2.0:javaagent")
 include(":instrumentation:spring:starters:spring-boot-starter")
 include(":instrumentation:spring:starters:zipkin-spring-boot-starter")
@@ -576,16 +576,16 @@ include(":instrumentation:struts:struts-7.0:javaagent")
 include(":instrumentation:tapestry-5.4:javaagent")
 include(":instrumentation:tomcat:tomcat-7.0:javaagent")
 include(":instrumentation:tomcat:tomcat-10.0:javaagent")
-include(":instrumentation:tomcat:tomcat-common:javaagent")
-include(":instrumentation:tomcat:tomcat-jdbc")
+include(":instrumentation:tomcat:tomcat-common-7.0:javaagent")
+include(":instrumentation:tomcat:tomcat-jdbc-8.5:javaagent")
 include(":instrumentation:twilio-6.6:javaagent")
 include(":instrumentation:undertow-1.4:bootstrap")
 include(":instrumentation:undertow-1.4:javaagent")
 include(":instrumentation:vaadin-14.2:javaagent")
 include(":instrumentation:vaadin-14.2:testing")
 include(":instrumentation:vertx:vertx-http-client:vertx-http-client-3.0:javaagent")
 include(":instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent")
-include(":instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent")
+include(":instrumentation:vertx:vertx-http-client:vertx-http-client-common-3.0:javaagent")
 include(":instrumentation:vertx:vertx-kafka-client-3.6:javaagent")
 include(":instrumentation:vertx:vertx-kafka-client-3.6:testing")
 include(":instrumentation:vertx:vertx-redis-client-4.0:javaagent")
@@ -603,8 +603,8 @@ include(":instrumentation:wicket-8.0:wicket10-testing")
 include(":instrumentation:xxl-job:xxl-job-1.9.2:javaagent")
 include(":instrumentation:xxl-job:xxl-job-2.1.2:javaagent")
 include(":instrumentation:xxl-job:xxl-job-2.3.0:javaagent")
-include(":instrumentation:xxl-job:xxl-job-common:javaagent")
-include(":instrumentation:xxl-job:xxl-job-common:testing")
+include(":instrumentation:xxl-job:xxl-job-common-2.1.2:javaagent")
+include(":instrumentation:xxl-job:xxl-job-common-2.1.2:testing")
 include(":instrumentation:zio:zio-2.0:javaagent")
 
 // benchmark