From 4fea4ac1f7b89464d6b17c38f05f155d9311af47 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 14 May 2021 17:16:24 +0900 Subject: [PATCH 1/3] Switch to colon notation for dependencies. --- .../jetty-perftest/jetty-perftest.gradle | 4 +- buildSrc/build.gradle | 26 +++---- examples/distro/build.gradle | 10 +-- .../instrumentation/servlet-3/build.gradle | 14 ++-- gradle/dependencies.gradle | 70 +++++++++---------- gradle/java.gradle | 8 +-- .../javaagent/akka-actor-2.5-javaagent.gradle | 4 +- .../javaagent/akka-http-10.0-javaagent.gradle | 8 +-- ...che-camel-2.20-javaagent-unit-tests.gradle | 6 +- .../apache-camel-2.20-javaagent.gradle | 36 +++++----- .../apache-dubbo-2.7-javaagent.gradle | 8 +-- .../library/apache-dubbo-2.7-library.gradle | 8 +-- .../testing/apache-dubbo-2.7-testing.gradle | 6 +- ...pache-httpasyncclient-4.1-javaagent.gradle | 2 +- .../apache-httpclient-2.0-javaagent.gradle | 4 +- .../apache-httpclient-4.0-javaagent.gradle | 2 +- .../apache-httpclient-5.0-javaagent.gradle | 2 +- .../javaagent/armeria-1.3-javaagent.gradle | 2 +- .../library/armeria-1.3-library.gradle | 2 +- .../testing/armeria-1.3-testing.gradle | 4 +- .../async-http-client-1.9-javaagent.gradle | 2 +- .../async-http-client-2.0-javaagent.gradle | 2 +- .../javaagent/aws-lambda-1.0-javaagent.gradle | 4 +- .../library/aws-lambda-1.0-library.gradle | 6 +- .../testing/aws-lambda-1.0-testing.gradle | 4 +- .../aws-sdk-1.11-javaagent-unit-tests.gradle | 4 +- .../javaagent/aws-sdk-1.11-javaagent.gradle | 30 ++++---- .../library/aws-sdk-1.11-library.gradle | 16 ++--- .../testing/aws-sdk-1.11-testing.gradle | 18 ++--- .../javaagent/aws-sdk-2.2-javaagent.gradle | 2 +- .../library/aws-sdk-2.2-library.gradle | 4 +- .../testing/aws-sdk-2.2-testing.gradle | 14 ++-- .../javaagent/cassandra-3.0-javaagent.gradle | 6 +- .../javaagent/cassandra-4.0-javaagent.gradle | 4 +- .../cdi-testing/cdi-testing.gradle | 12 ++-- .../couchbase-2.0-javaagent-unittests.gradle | 2 +- .../javaagent/couchbase-2.0-javaagent.gradle | 6 +- .../javaagent/couchbase-2.6-javaagent.gradle | 10 +-- .../javaagent/couchbase-3.1-javaagent.gradle | 6 +- .../couchbase-testing.gradle | 6 +- .../dropwizard-testing.gradle | 6 +- .../dropwizard-views-0.7-javaagent.gradle | 6 +- .../elasticsearch-rest-5.0-javaagent.gradle | 18 ++--- .../elasticsearch-rest-6.4-javaagent.gradle | 18 ++--- .../elasticsearch-rest-7.0-javaagent.gradle | 10 +-- .../elasticsearch-rest-common-library.gradle | 2 +- ...asticsearch-transport-5.0-javaagent.gradle | 10 +-- ...asticsearch-transport-5.3-javaagent.gradle | 16 ++--- ...asticsearch-transport-6.0-javaagent.gradle | 8 +-- ...sticsearch-transport-common-library.gradle | 2 +- .../external-annotations-javaagent.gradle | 16 ++--- .../javaagent/finatra-2.9-javaagent.gradle | 10 +-- .../javaagent/geode-1.4-javaagent.gradle | 2 +- .../google-http-client-1.19-javaagent.gradle | 2 +- .../javaagent/grizzly-2.0-javaagent.gradle | 12 ++-- .../javaagent/grpc-1.6-javaagent.gradle | 10 +-- .../grpc-1.6/library/grpc-1.6-library.gradle | 10 +-- .../grpc-1.6/testing/grpc-1.6-testing.gradle | 10 +-- .../javaagent/guava-10.0-javaagent.gradle | 2 +- .../library/guava-10.0-library.gradle | 2 +- .../javaagent/gwt-2.0-javaagent.gradle | 2 +- .../javaagent/hibernate-3.3-javaagent.gradle | 12 ++-- .../javaagent/hibernate-4.0-javaagent.gradle | 6 +- .../javaagent/hibernate-4.3-javaagent.gradle | 34 ++++----- .../http-url-connection-javaagent.gradle | 2 +- .../javaagent/hystrix-1.4-javaagent.gradle | 4 +- ...-loader-javaagent-integration-tests.gradle | 2 +- .../internal-class-loader-javaagent.gradle | 10 +-- ...-loader-javaagent-integration-tests.gradle | 4 +- .../jaxrs-client-1.1-javaagent.gradle | 2 +- .../jaxrs-client-2.0-common-javaagent.gradle | 20 +++--- .../jaxrs-client-2.0-cxf-3.0-javaagent.gradle | 2 +- ...xrs-client-2.0-jersey-2.0-javaagent.gradle | 2 +- ...s-client-2.0-resteasy-3.0-javaagent.gradle | 2 +- .../javaagent/jaxrs-1.0-javaagent.gradle | 6 +- .../jaxrs-2.0-common-javaagent.gradle | 2 +- .../jaxrs-2.0-cxf-3.2-javaagent.gradle | 16 ++--- .../jaxrs-2.0-jersey-2.0-javaagent.gradle | 20 +++--- .../jaxrs-2.0-resteasy-3.0-javaagent.gradle | 16 ++--- .../jaxrs-2.0-resteasy-3.1-javaagent.gradle | 12 ++-- ...jaxrs-2.0-resteasy-common-javaagent.gradle | 4 +- .../jaxrs-2.0-testing.gradle | 4 +- .../jaxws-2.0-axis2-1.6-javaagent.gradle | 16 ++--- .../jaxws-2.0-axis2-1.6-library.gradle | 2 +- .../jaxws-2.0-cxf-3.0-javaagent.gradle | 18 ++--- .../library/jaxws-2.0-cxf-3.0-library.gradle | 4 +- .../jaxws-2.0-metro-2.2-javaagent.gradle | 6 +- .../jaxws-2.0-testing.gradle | 8 +-- .../javaagent/jaxws-2.0-javaagent.gradle | 2 +- .../javaagent/jws-1.1-javaagent.gradle | 2 +- .../jdbc/javaagent/jdbc-javaagent.gradle | 16 ++--- .../javaagent/jedis-1.4-javaagent.gradle | 6 +- .../javaagent/jedis-3.0-javaagent.gradle | 6 +- .../javaagent/jetty-11.0-javaagent.gradle | 4 +- .../javaagent/jetty-8.0-javaagent.gradle | 12 ++-- .../jms-1.1-javaagent-unit-tests.gradle | 2 +- .../javaagent/jms-1.1-javaagent.gradle | 10 +-- .../library/jsf-common-library.gradle | 4 +- .../jsf-testing-common.gradle | 14 ++-- .../javaagent/mojarra-1.2-javaagent.gradle | 12 ++-- .../javaagent/myfaces-1.2-javaagent.gradle | 16 ++--- .../javaagent/jsp-2.3-javaagent.gradle | 22 +++--- .../kafka-clients-0.11-javaagent.gradle | 20 +++--- .../kafka-streams-0.11-javaagent.gradle | 24 +++---- ...tes-client-7.0-javaagent-unit-tests.gradle | 2 +- .../kubernetes-client-7.0-javaagent.gradle | 2 +- .../javaagent/lettuce-4.0-javaagent.gradle | 6 +- .../javaagent/lettuce-5.0-javaagent.gradle | 6 +- .../javaagent/lettuce-5.1-javaagent.gradle | 6 +- .../library/lettuce-5.1-library.gradle | 2 +- .../testing/lettuce-5.1-testing.gradle | 4 +- .../javaagent/liberty-javaagent.gradle | 2 +- .../javaagent/log4j-1.2-javaagent.gradle | 2 +- .../log4j-2-testing/log4j-2-testing.gradle | 4 +- .../javaagent/log4j-2.13.2-javaagent.gradle | 2 +- .../library/log4j-2.13.2-library.gradle | 2 +- .../javaagent/log4j-2.7-javaagent.gradle | 4 +- .../javaagent/logback-1.0-javaagent.gradle | 4 +- .../library/logback-1.0-library.gradle | 4 +- .../testing/logback-1.0-testing.gradle | 2 +- .../javaagent/mongo-3.1-javaagent.gradle | 2 +- .../library/mongo-3.1-library.gradle | 2 +- .../testing/mongo-3.1-testing.gradle | 2 +- .../javaagent/mongo-3.7-javaagent.gradle | 2 +- .../javaagent/mongo-4.0-javaagent.gradle | 8 +-- .../mongo-async-3.3-javaagent.gradle | 2 +- .../mongo/mongo-testing/mongo-testing.gradle | 2 +- .../javaagent/netty-3.8-javaagent.gradle | 10 +-- .../javaagent/netty-4.0-javaagent.gradle | 4 +- .../javaagent/netty-4.1-javaagent.gradle | 8 +-- .../library/netty-4.1-library.gradle | 2 +- .../javaagent/okhttp-2.2-javaagent.gradle | 4 +- .../javaagent/okhttp-3.0-javaagent.gradle | 2 +- .../library/okhttp-3.0-library.gradle | 2 +- .../testing/okhttp-3.0-testing.gradle | 2 +- .../oshi/javaagent/oshi-javaagent.gradle | 2 +- .../oshi/library/oshi-library.gradle | 2 +- .../javaagent/play-2.4-javaagent.gradle | 14 ++-- .../javaagent/rabbitmq-2.7-javaagent.gradle | 6 +- .../javaagent/ratpack-1.4-javaagent.gradle | 6 +- .../javaagent/reactor-3.1-javaagent.gradle | 10 +-- .../library/reactor-3.1-library.gradle | 10 +-- .../testing/reactor-3.1-testing.gradle | 2 +- .../reactor-netty-0.9-javaagent.gradle | 2 +- .../javaagent/rediscala-1.8-javaagent.gradle | 4 +- .../javaagent/redisson-3.0-javaagent.gradle | 4 +- .../rocketmq-client-4.8-javaagent.gradle | 2 +- .../rocketmq-client-4.8-library.gradle | 2 +- .../rocketmq-client-4.8-testing.gradle | 2 +- .../library/rxjava-1.0-library.gradle | 2 +- .../javaagent/rxjava-2.0-javaagent.gradle | 2 +- .../library/rxjava-2.0-library.gradle | 2 +- .../testing/rxjava-2.0-testing.gradle | 2 +- .../javaagent/rxjava-3.0-javaagent.gradle | 2 +- .../library/rxjava-3.0-library.gradle | 2 +- .../testing/rxjava-3.0-testing.gradle | 2 +- .../scala-executors-javaagent.gradle | 8 +-- .../glassfish-testing.gradle | 2 +- .../javaagent/servlet-2.2-javaagent.gradle | 10 +-- .../library/servlet-2.2-library.gradle | 2 +- .../javaagent/servlet-3.0-javaagent.gradle | 18 ++--- .../library/servlet-3.0-library.gradle | 2 +- .../javaagent/servlet-5.0-javaagent.gradle | 10 +-- .../library/servlet-5.0-library.gradle | 6 +- .../servlet-javax-common-javaagent.gradle | 6 +- .../servlet-javax-common-library.gradle | 4 +- .../javaagent/spark-2.3-javaagent.gradle | 4 +- .../spring-batch-3.0-javaagent.gradle | 4 +- .../spring-boot-autoconfigure.gradle | 26 +++---- .../spring-core-2.0-javaagent.gradle | 4 +- .../spring-data-1.8-javaagent.gradle | 18 ++--- .../spring-scheduling-3.1-javaagent.gradle | 4 +- .../spring-webflux-5.0-javaagent.gradle | 12 ++-- .../library/spring-webflux-5.0-library.gradle | 4 +- .../spring-webmvc-3.1-javaagent.gradle | 22 +++--- .../library/spring-webmvc-3.1-library.gradle | 4 +- .../javaagent/spring-ws-2.0-javaagent.gradle | 16 ++--- .../jaeger-exporter-starter.gradle | 2 +- .../otlp-exporter-starter.gradle | 2 +- .../spring-starter/spring-starter.gradle | 2 +- .../spymemcached-2.12-javaagent.gradle | 2 +- .../javaagent/struts-2.3-javaagent.gradle | 12 ++-- .../javaagent/tapestry-5.4-javaagent.gradle | 4 +- .../javaagent/tomcat-10.0-javaagent.gradle | 2 +- .../javaagent/tomcat-7.0-javaagent.gradle | 6 +- .../javaagent/tomcat-common-javaagent.gradle | 2 +- .../javaagent/twilio-6.6-javaagent.gradle | 4 +- .../vertx-reactive-3.5-javaagent.gradle | 20 +++--- .../javaagent/vertx-web-3.0-javaagent.gradle | 8 +-- .../javaagent/wicket-8.0-javaagent.gradle | 8 +-- .../javaagent-bootstrap.gradle | 2 +- javaagent-tooling/javaagent-tooling.gradle | 2 +- .../integration-tests.gradle | 4 +- testing-common/testing-common.gradle | 6 +- testing/agent-exporter/agent-exporter.gradle | 2 +- 195 files changed, 716 insertions(+), 716 deletions(-) diff --git a/benchmark-integration/jetty-perftest/jetty-perftest.gradle b/benchmark-integration/jetty-perftest/jetty-perftest.gradle index a9ae31f2d6d4..c841893ad016 100644 --- a/benchmark-integration/jetty-perftest/jetty-perftest.gradle +++ b/benchmark-integration/jetty-perftest/jetty-perftest.gradle @@ -2,8 +2,8 @@ dependencies { implementation project(':javaagent-bootstrap') implementation project(':benchmark-integration') - implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120' - implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120' + implementation "org.eclipse.jetty:jetty-server:9.4.1.v20170120" + implementation "org.eclipse.jetty:jetty-servlet:9.4.1.v20170120" } jar { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 6ba2d6ffa051..b9676e0f8005 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -37,17 +37,17 @@ dependencies { implementation(gradleApi()) implementation(localGroovy()) - implementation group: "org.eclipse.aether", name: "aether-connector-basic", version: "1.1.0" - implementation group: "org.eclipse.aether", name: "aether-transport-http", version: "1.1.0" - implementation group: "org.apache.maven", name: "maven-aether-provider", version: "3.3.9" - - implementation group: "com.google.guava", name: "guava", version: "30.1-jre" - implementation group: "org.ow2.asm", name: "asm", version: "7.0-beta" - implementation group: "org.ow2.asm", name: "asm-tree", version: "7.0-beta" - implementation group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.10" - implementation group: "net.bytebuddy", name: "byte-buddy-gradle-plugin", version: "1.10.18" - - testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "5.7.1" - testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.7.1" - testImplementation group: "org.assertj", name: "assertj-core", version: "3.19.0" + implementation "org.eclipse.aether:aether-connector-basic:1.1.0" + implementation "org.eclipse.aether:aether-transport-http:1.1.0" + implementation "org.apache.maven:maven-aether-provider:3.3.9" + + implementation "com.google.guava:guava:30.1-jre" + implementation "org.ow2.asm:asm:7.0-beta" + implementation "org.ow2.asm:asm-tree:7.0-beta" + implementation "org.apache.httpcomponents:httpclient:4.5.10" + implementation "net.bytebuddy:byte-buddy-gradle-plugin:1.10.18" + + testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1" + testImplementation "org.assertj:assertj-core:3.19.0" } diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 0fb38b13a9bd..6eaee28cf2b7 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -17,12 +17,12 @@ subprojects { versions.opentelemetryJavaagentAlpha = "${versions.opentelemetryJavaagent}-alpha" deps = [ - bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: versions.bytebuddy), - bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: versions.bytebuddy), + bytebuddy : dependencies.create("net.bytebuddy:byte-buddy:${versions.bytebuddy}"), + bytebuddyagent : dependencies.create("net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}"), autoservice : [ - dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc7'), - dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.8'), - dependencies.create(group: 'com.google.guava', name: 'guava', version: "${versions.guava}"), + dependencies.create("com.google.auto.service:auto-service:1.0-rc7"), + dependencies.create("com.google.auto:auto-common:0.8"), + dependencies.create("com.google.guava:guava:${versions.guava}"), ], autoValueAnnotations: "com.google.auto.value:auto-value-annotations:${versions.autoValue}", ] diff --git a/examples/distro/instrumentation/servlet-3/build.gradle b/examples/distro/instrumentation/servlet-3/build.gradle index 73182fd7769c..a33a088cd5d1 100644 --- a/examples/distro/instrumentation/servlet-3/build.gradle +++ b/examples/distro/instrumentation/servlet-3/build.gradle @@ -1,17 +1,17 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' + compileOnly "javax.servlet:javax.servlet-api:3.0.1" - testInstrumentation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-servlet-common', version: versions.opentelemetryJavaagentAlpha - testInstrumentation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-servlet-2.2', version: versions.opentelemetryJavaagentAlpha - testInstrumentation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-servlet-3.0', version: versions.opentelemetryJavaagentAlpha + testInstrumentation "io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common:${versions.opentelemetryJavaagentAlpha}" + testInstrumentation "io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-2.2:${versions.opentelemetryJavaagentAlpha}" + testInstrumentation "io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions.opentelemetryJavaagentAlpha}" testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common:${versions.opentelemetryJavaagentAlpha}") { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901' + testImplementation "javax.servlet:javax.servlet-api:3.0.1" + testImplementation "org.eclipse.jetty:jetty-server:8.0.0.v20110901" + testImplementation "org.eclipse.jetty:jetty-servlet:8.0.0.v20110901" } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 7bd9ea1bf237..500111e051b7 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -40,43 +40,43 @@ ext { deps = [ // OpenTelemetry - opentelemetryApi : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-api', version: versions.opentelemetry), - opentelemetryApiMetrics : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-api-metrics', version: versions.opentelemetryAlpha), - opentelemetryExtAnnotations : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-annotations', version: versions.opentelemetry), - opentelemetryExtAws : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-aws', version: versions.opentelemetry), - opentelemetryContext : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-context', version: versions.opentelemetry), - opentelemetryKotlin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-kotlin', version: versions.opentelemetry), - opentelemetryLogging : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-logging', version: versions.opentelemetry), - opentelemetryTraceProps : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-trace-propagators', version: versions.opentelemetry), - opentelemetrySdk : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: versions.opentelemetry), - opentelemetrySdkAutoconfigure: dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-extension-autoconfigure', version: versions.opentelemetryAlpha), - opentelemetrySdkMetrics : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-metrics', version: versions.opentelemetryAlpha), - opentelemetryJaeger : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-jaeger', version: versions.opentelemetry), - opentelemetryOtlp : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp', version: versions.opentelemetry), - opentelemetryOtlpMetrics : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp-metrics', version: versions.opentelemetryAlpha), - opentelemetryZipkin : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-zipkin', version: versions.opentelemetry), - opentelemetryPrometheus : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-prometheus', version: versions.opentelemetryAlpha), - opentelemetryLogging : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-logging', version: versions.opentelemetry), - opentelemetryProto : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-proto', version: versions.opentelemetryAlpha), - opentelemetryResources : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-extension-resources', version: versions.opentelemetry), - opentelemetrySdkTesting : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-sdk-testing', version: versions.opentelemetry), - opentelemetrySemConv : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-semconv', version: versions.opentelemetryAlpha), + opentelemetryApi : dependencies.create("io.opentelemetry:opentelemetry-api:${versions.opentelemetry}"), + opentelemetryApiMetrics : dependencies.create("io.opentelemetry:opentelemetry-api-metrics:${versions.opentelemetryAlpha}"), + opentelemetryExtAnnotations : dependencies.create("io.opentelemetry:opentelemetry-extension-annotations:${versions.opentelemetry}"), + opentelemetryExtAws : dependencies.create("io.opentelemetry:opentelemetry-extension-aws:${versions.opentelemetry}"), + opentelemetryContext : dependencies.create("io.opentelemetry:opentelemetry-context:${versions.opentelemetry}"), + opentelemetryKotlin : dependencies.create("io.opentelemetry:opentelemetry-extension-kotlin:${versions.opentelemetry}"), + opentelemetryLogging : dependencies.create("io.opentelemetry:opentelemetry-exporter-logging:${versions.opentelemetry}"), + opentelemetryTraceProps : dependencies.create("io.opentelemetry:opentelemetry-extension-trace-propagators:${versions.opentelemetry}"), + opentelemetrySdk : dependencies.create("io.opentelemetry:opentelemetry-sdk:${versions.opentelemetry}"), + opentelemetrySdkAutoconfigure: dependencies.create("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions.opentelemetryAlpha}"), + opentelemetrySdkMetrics : dependencies.create("io.opentelemetry:opentelemetry-sdk-metrics:${versions.opentelemetryAlpha}"), + opentelemetryJaeger : dependencies.create("io.opentelemetry:opentelemetry-exporter-jaeger:${versions.opentelemetry}"), + opentelemetryOtlp : dependencies.create("io.opentelemetry:opentelemetry-exporter-otlp:${versions.opentelemetry}"), + opentelemetryOtlpMetrics : dependencies.create("io.opentelemetry:opentelemetry-exporter-otlp-metrics:${versions.opentelemetryAlpha}"), + opentelemetryZipkin : dependencies.create("io.opentelemetry:opentelemetry-exporter-zipkin:${versions.opentelemetry}"), + opentelemetryPrometheus : dependencies.create("io.opentelemetry:opentelemetry-exporter-prometheus:${versions.opentelemetryAlpha}"), + opentelemetryLogging : dependencies.create("io.opentelemetry:opentelemetry-exporter-logging:${versions.opentelemetry}"), + opentelemetryProto : dependencies.create("io.opentelemetry:opentelemetry-proto:${versions.opentelemetryAlpha}"), + opentelemetryResources : dependencies.create("io.opentelemetry:opentelemetry-sdk-extension-resources:${versions.opentelemetry}"), + opentelemetrySdkTesting : dependencies.create("io.opentelemetry:opentelemetry-sdk-testing:${versions.opentelemetry}"), + opentelemetrySemConv : dependencies.create("io.opentelemetry:opentelemetry-semconv:${versions.opentelemetryAlpha}"), // General slf4j : "org.slf4j:slf4j-api:${versions.slf4j}", guava : "com.google.guava:guava:$versions.guava", - bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: "${versions.bytebuddy}"), - bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"), + bytebuddy : dependencies.create("net.bytebuddy:byte-buddy:${versions.bytebuddy}"), + bytebuddyagent : dependencies.create("net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}"), autoservice : [ - dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc7'), - dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.8'), + dependencies.create("com.google.auto.service:auto-service:1.0-rc7"), + dependencies.create("com.google.auto:auto-common:0.8"), ], autoValueAnnotations : "com.google.auto.value:auto-value-annotations:${versions.autoValue}", // annotation processor autoValue : "com.google.auto.value:auto-value:${versions.autoValue}", prometheus : [ - dependencies.create(group: 'io.prometheus', name: 'simpleclient', version: "${versions.prometheus}"), - dependencies.create(group: 'io.prometheus', name: 'simpleclient_httpserver', version: "${versions.prometheus}"), + dependencies.create("io.prometheus:simpleclient:${versions.prometheus}"), + dependencies.create("io.prometheus:simpleclient_httpserver:${versions.prometheus}"), ], caffeine : "com.github.ben-manes.caffeine:caffeine:${versions.caffeine}", weaklockfree : "com.blogspot.mydailyjava:weak-lock-free:${versions.weaklockfree}", @@ -88,20 +88,20 @@ ext { exclude group: 'org.codehaus.groovy', module: 'groovy-all' }), // Used by Spock for mocking: - dependencies.create(group: 'org.objenesis', name: 'objenesis', version: '3.1') + dependencies.create("org.objenesis:objenesis:3.1") ], groovy : "org.codehaus.groovy:groovy-all:${versions.groovy}", systemLambda : "com.github.stefanbirkner:system-lambda:${versions.systemLambda}", testcontainers : "org.testcontainers:testcontainers:${versions.testcontainers}", testLogging : [ - dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: versions.logback), - dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: versions.slf4j), - dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j), - dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j), + dependencies.create("ch.qos.logback:logback-classic:${versions.logback}"), + dependencies.create("org.slf4j:log4j-over-slf4j:${versions.slf4j}"), + dependencies.create("org.slf4j:jcl-over-slf4j:${versions.slf4j}"), + dependencies.create("org.slf4j:jul-to-slf4j:${versions.slf4j}"), ], - scala : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"), - kotlin : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"), - coroutines : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"), + scala : dependencies.create("org.scala-lang:scala-library:${versions.scala}"), + kotlin : dependencies.create("org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"), + coroutines : dependencies.create("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}"), junitApi : "org.junit.jupiter:junit-jupiter-api:${versions.junit5}", assertj : "org.assertj:assertj-core:${versions.assertj}", awaitility : "org.awaitility:awaitility:${versions.awaitility}", diff --git a/gradle/java.gradle b/gradle/java.gradle index e3249bf5d12d..98c6bdc70855 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -70,9 +70,9 @@ repositories { } dependencies { - compileOnly group: 'org.checkerframework', name: 'checker-qual', version: versions.checkerFramework + compileOnly "org.checkerframework:checker-qual:${versions.checkerFramework}" - testImplementation enforcedPlatform(group: 'org.junit', name: 'junit-bom', version: versions.junit5) + testImplementation enforcedPlatform("org.junit:junit-bom:${versions.junit5}") testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine' @@ -81,8 +81,8 @@ dependencies { testImplementation deps.spock testImplementation deps.groovy testImplementation deps.testLogging - testImplementation group: 'info.solidsoft.spock', name: 'spock-global-unroll', version: '0.5.1' - testImplementation group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0' + testImplementation "info.solidsoft.spock:spock-global-unroll:0.5.1" + testImplementation "com.github.stefanbirkner:system-rules:1.19.0" } tasks.named('jar').configure { diff --git a/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle b/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle index 931d97336b4c..b1bff11f8ace 100644 --- a/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle +++ b/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle @@ -11,10 +11,10 @@ muzzle { dependencies { implementation project(':instrumentation:executors:javaagent') - compileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0' + compileOnly "com.typesafe.akka:akka-actor_2.11:2.5.0" testImplementation deps.scala - testImplementation group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.5.0' + testImplementation "com.typesafe.akka:akka-actor_2.11:2.5.0" } tasks.withType(Test).configureEach { diff --git a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle index d61d985145b3..3e510592cc92 100644 --- a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle +++ b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle @@ -48,12 +48,12 @@ muzzle { } dependencies { - library group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0' - library group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.4.14' + library "com.typesafe.akka:akka-http_2.11:10.0.0" + library "com.typesafe.akka:akka-stream_2.11:2.4.14" // There are some internal API changes in 10.1 that we would like to test separately for - version101TestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.0' - version101TestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.5.11' + version101TestImplementation "com.typesafe.akka:akka-http_2.11:10.1.0" + version101TestImplementation "com.typesafe.akka:akka-stream_2.11:2.5.11" } test.dependsOn version101Test diff --git a/instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle b/instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle index 3e4996c722bb..e0420e28920e 100644 --- a/instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle +++ b/instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle @@ -2,9 +2,9 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { testImplementation project(':instrumentation:apache-camel-2.20:javaagent') - testImplementation group: 'org.apache.camel', name: 'camel-core', version: '2.20.1' - testImplementation group: 'org.apache.camel', name: 'camel-aws', version: '2.20.1' - testImplementation group: 'org.apache.camel', name: 'camel-http', version: '2.20.1' + testImplementation "org.apache.camel:camel-core:2.20.1" + testImplementation "org.apache.camel:camel-aws:2.20.1" + testImplementation "org.apache.camel:camel-http:2.20.1" testImplementation deps.opentelemetryTraceProps testImplementation deps.opentelemetryExtAws diff --git a/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle b/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle index a799fbea5438..f8f351d57e2a 100644 --- a/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle +++ b/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle @@ -13,37 +13,37 @@ ext { } dependencies { - library group: 'org.apache.camel', name: 'camel-core', version: "$camelversion" + library "org.apache.camel:camel-core:$camelversion" implementation deps.opentelemetryExtAws testInstrumentation project(':instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:aws-sdk:aws-sdk-1.11:javaagent') - testLibrary group: 'org.apache.camel', name: 'camel-spring-boot-starter', version: "$camelversion" - testLibrary group: 'org.apache.camel', name: 'camel-jetty-starter', version: "$camelversion" - testLibrary group: 'org.apache.camel', name: 'camel-http-starter', version: "$camelversion" - testLibrary group: 'org.apache.camel', name: 'camel-jaxb-starter', version: "$camelversion" - testLibrary group: 'org.apache.camel', name: 'camel-undertow', version: "$camelversion" - testLibrary group: 'org.apache.camel', name: 'camel-aws', version: "$camelversion" + testLibrary "org.apache.camel:camel-spring-boot-starter:$camelversion" + testLibrary "org.apache.camel:camel-jetty-starter:$camelversion" + testLibrary "org.apache.camel:camel-http-starter:$camelversion" + testLibrary "org.apache.camel:camel-jaxb-starter:$camelversion" + testLibrary "org.apache.camel:camel-undertow:$camelversion" + testLibrary "org.apache.camel:camel-aws:$camelversion" - testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.17.RELEASE' - testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter', version: '1.5.17.RELEASE' + testImplementation "org.springframework.boot:spring-boot-starter-test:1.5.17.RELEASE" + testImplementation "org.springframework.boot:spring-boot-starter:1.5.17.RELEASE" - testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock" + testImplementation "org.spockframework:spock-spring:$versions.spock" testImplementation 'javax.xml.bind:jaxb-api:2.3.1' - testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.12', version: '1.0.0' + testImplementation "org.elasticmq:elasticmq-rest-sqs_2.12:1.0.0" testImplementation deps.testcontainers testImplementation "org.testcontainers:localstack:${versions.testcontainers}" - latestDepTestLibrary group: 'org.apache.camel', name: 'camel-core', version: '2.+' - latestDepTestLibrary group: 'org.apache.camel', name: 'camel-spring-boot-starter', version: '2.+' - latestDepTestLibrary group: 'org.apache.camel', name: 'camel-jetty-starter', version: '2.+' - latestDepTestLibrary group: 'org.apache.camel', name: 'camel-http-starter', version: '2.+' - latestDepTestLibrary group: 'org.apache.camel', name: 'camel-jaxb-starter', version: '2.+' - latestDepTestLibrary group: 'org.apache.camel', name: 'camel-undertow', version: '2.+' - latestDepTestLibrary group: 'org.apache.camel', name: 'camel-aws', version: '2.+' + latestDepTestLibrary "org.apache.camel:camel-core:2.+" + latestDepTestLibrary "org.apache.camel:camel-spring-boot-starter:2.+" + latestDepTestLibrary "org.apache.camel:camel-jetty-starter:2.+" + latestDepTestLibrary "org.apache.camel:camel-http-starter:2.+" + latestDepTestLibrary "org.apache.camel:camel-jaxb-starter:2.+" + latestDepTestLibrary "org.apache.camel:camel-undertow:2.+" + latestDepTestLibrary "org.apache.camel:camel-aws:2.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle b/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle index 643ee9ec1cd2..c0f7d6c694d6 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle +++ b/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle @@ -11,11 +11,11 @@ muzzle { dependencies { implementation project(':instrumentation:apache-dubbo:apache-dubbo-2.7:library') - library group: 'org.apache.dubbo', name: 'dubbo', version: '2.7.0' + library "org.apache.dubbo:dubbo:2.7.0" testImplementation project(':instrumentation:apache-dubbo:apache-dubbo-2.7:testing') - testLibrary group: 'org.apache.dubbo', name: 'dubbo-config-api', version: '2.7.0' - latestDepTestLibrary group: 'org.apache.dubbo', name: 'dubbo', version: '2.+' - latestDepTestLibrary group: 'org.apache.dubbo', name: 'dubbo-config-api', version: '2.+' + testLibrary "org.apache.dubbo:dubbo-config-api:2.7.0" + latestDepTestLibrary "org.apache.dubbo:dubbo:2.+" + latestDepTestLibrary "org.apache.dubbo:dubbo-config-api:2.+" } diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle b/instrumentation/apache-dubbo/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle index 36b9c29e613e..6bcd731dba5c 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle +++ b/instrumentation/apache-dubbo/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle @@ -1,11 +1,11 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'org.apache.dubbo', name: 'dubbo', version: '2.7.0' + library "org.apache.dubbo:dubbo:2.7.0" testImplementation project(':instrumentation:apache-dubbo:apache-dubbo-2.7:testing') - testLibrary group: 'org.apache.dubbo', name: 'dubbo-config-api', version: '2.7.0' - latestDepTestLibrary group: 'org.apache.dubbo', name: 'dubbo', version: '2.+' - latestDepTestLibrary group: 'org.apache.dubbo', name: 'dubbo-config-api', version: '2.+' + testLibrary "org.apache.dubbo:dubbo-config-api:2.7.0" + latestDepTestLibrary "org.apache.dubbo:dubbo:2.+" + latestDepTestLibrary "org.apache.dubbo:dubbo-config-api:2.+" } \ No newline at end of file diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle b/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle index 176de149dc08..dfd5a4bcadf6 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle +++ b/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle @@ -9,10 +9,10 @@ def apacheDubboVersion = '2.7.5' dependencies { api project(':testing-common') - api group: 'org.apache.dubbo', name: 'dubbo', version: apacheDubboVersion - api group: 'org.apache.dubbo', name: 'dubbo-config-api', version: apacheDubboVersion + api "org.apache.dubbo:dubbo:${apacheDubboVersion}" + api "org.apache.dubbo:dubbo-config-api:${apacheDubboVersion}" - implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' + implementation "javax.annotation:javax.annotation-api:1.3.2" implementation deps.guava implementation deps.groovy diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle b/instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle index 3da8a856286b..ef37e58c4fca 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle @@ -12,5 +12,5 @@ muzzle { } dependencies { - library group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1' + library "org.apache.httpcomponents:httpasyncclient:4.1" } diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle index 3279fe85d29b..609b5b7e1bbd 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0' + library "commons-httpclient:commons-httpclient:2.0" - latestDepTestLibrary group: 'commons-httpclient', name: 'commons-httpclient', version: '3.+' + latestDepTestLibrary "commons-httpclient:commons-httpclient:3.+" } diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle index bca955df5609..2e39b629d45b 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle @@ -22,5 +22,5 @@ muzzle { } dependencies { - library group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0' + library "org.apache.httpcomponents:httpclient:4.0" } diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle index ff418b677331..1e0b6ab9e247 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle +++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle @@ -9,5 +9,5 @@ muzzle { } dependencies { - library group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.0' + library "org.apache.httpcomponents.client5:httpclient5:5.0" } diff --git a/instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle b/instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle index fc10d2b885d7..f33ff6ac94af 100644 --- a/instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle +++ b/instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle @@ -12,7 +12,7 @@ muzzle { dependencies { implementation project(':instrumentation:armeria-1.3:library') - library group: 'com.linecorp.armeria', name: 'armeria', version: '1.3.0' + library "com.linecorp.armeria:armeria:1.3.0" testImplementation project(':instrumentation:armeria-1.3:testing') } diff --git a/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle b/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle index 7e15d729b5c2..9ac9f13f9cf4 100644 --- a/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle +++ b/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" apply plugin: "net.ltgt.errorprone" dependencies { - library group: 'com.linecorp.armeria', name: 'armeria', version: '1.3.0' + library "com.linecorp.armeria:armeria:1.3.0" testImplementation project(':instrumentation:armeria-1.3:testing') } diff --git a/instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle b/instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle index 5ea3416ece4b..4c504558381e 100644 --- a/instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle +++ b/instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle @@ -3,8 +3,8 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'com.linecorp.armeria', name: 'armeria', version: '1.3.0' - api group: 'com.linecorp.armeria', name: 'armeria-junit4', version: '1.3.0' + api "com.linecorp.armeria:armeria:1.3.0" + api "com.linecorp.armeria:armeria-junit4:1.3.0" implementation deps.guava diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle b/instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle index 23c6e49a2c54..1e27b63ad7ab 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle @@ -10,5 +10,5 @@ muzzle { } dependencies { - library group: 'com.ning', name: 'async-http-client', version: '1.9.0' + library "com.ning:async-http-client:1.9.0" } diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle b/instrumentation/async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle index 60a56c453c0b..56270be38201 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle +++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle @@ -15,7 +15,7 @@ muzzle { } dependencies { - library group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.0' + library "org.asynchttpclient:async-http-client:2.0.0" testInstrumentation project(':instrumentation:netty:netty-4.0:javaagent') } diff --git a/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle b/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle index 9b367c65499c..f1785e397612 100644 --- a/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle +++ b/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle @@ -29,12 +29,12 @@ muzzle { dependencies { implementation project(':instrumentation:aws-lambda-1.0:library') - library group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.0.0' + library "com.amazonaws:aws-lambda-java-core:1.0.0" // First version to includes support for SQSEvent, currently the most popular message queue used // with lambda. // NB: 2.2.0 includes a class called SQSEvent but isn't usable due to it returning private classes // in public API. - library group: 'com.amazonaws', name: 'aws-lambda-java-events', version: '2.2.1' + library "com.amazonaws:aws-lambda-java-events:2.2.1" testImplementation project(':instrumentation:aws-lambda-1.0:testing') } diff --git a/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle b/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle index 1a7a7ae80c1b..c0b7cc615226 100644 --- a/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle +++ b/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle @@ -19,12 +19,12 @@ dependencies { compileOnly deps.opentelemetrySdk compileOnly deps.opentelemetrySdkAutoconfigure - library group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.0.0' + library "com.amazonaws:aws-lambda-java-core:1.0.0" // First version to includes support for SQSEvent, currently the most popular message queue used // with lambda. // NB: 2.2.0 includes a class called SQSEvent but isn't usable due to it returning private classes // in public API. - library group: 'com.amazonaws', name: 'aws-lambda-java-events', version: '2.2.1' + library "com.amazonaws:aws-lambda-java-events:2.2.1" compileOnly( 'com.fasterxml.jackson.core:jackson-databind:2.10.5.1', @@ -34,7 +34,7 @@ dependencies { implementation deps.opentelemetryExtAws // 1.2.0 allows to get the function ARN - testLibrary group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.0' + testLibrary "com.amazonaws:aws-lambda-java-core:1.2.0" testImplementation( 'com.fasterxml.jackson.core:jackson-databind:2.10.5.1', diff --git a/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle b/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle index 82ac8d96226a..36e7579864fd 100644 --- a/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle +++ b/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle @@ -19,8 +19,8 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.0.0' - api group: 'com.amazonaws', name: 'aws-lambda-java-events', version: '2.2.1' + api "com.amazonaws:aws-lambda-java-core:1.0.0" + api "com.amazonaws:aws-lambda-java-events:2.2.1" implementation deps.guava diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle index 3c4f1a06843d..d9cc6614af73 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle @@ -4,8 +4,8 @@ dependencies { api project(':testing-common') testImplementation project(':instrumentation:aws-sdk:aws-sdk-1.11:javaagent') - testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0' - testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106' + testImplementation "com.amazonaws:aws-java-sdk-core:1.11.0" + testImplementation "com.amazonaws:aws-java-sdk-sqs:1.11.106" testImplementation deps.assertj } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle index 9a066fe099bc..7672fae39c11 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle @@ -55,24 +55,24 @@ dependencies { implementation project(':instrumentation:aws-sdk:aws-sdk-1.11:library') - library group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0' + library "com.amazonaws:aws-java-sdk-core:1.11.0" - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '1.11.106' + testLibrary "com.amazonaws:aws-java-sdk-s3:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-rds:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-ec2:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-kinesis:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-dynamodb:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-sns:1.11.106" testImplementation project(':instrumentation:aws-sdk:aws-sdk-1.11:testing') - testSqsImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106' + testSqsImplementation "com.amazonaws:aws-java-sdk-sqs:1.11.106" // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. testInstrumentation project(':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent') // needed for kinesis: - testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: versions.jackson + testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" // needed for SNS testImplementation deps.testcontainers @@ -81,12 +81,12 @@ dependencies { // needed by S3 testImplementation 'javax.xml.bind:jaxb-api:2.3.1' - test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.0') - test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.0') - test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.0') - test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.0') - test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.0') - test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '1.11.0') + test_before_1_11_106Implementation("com.amazonaws:aws-java-sdk-s3:1.11.0") + test_before_1_11_106Implementation("com.amazonaws:aws-java-sdk-rds:1.11.0") + test_before_1_11_106Implementation("com.amazonaws:aws-java-sdk-ec2:1.11.0") + test_before_1_11_106Implementation("com.amazonaws:aws-java-sdk-kinesis:1.11.0") + test_before_1_11_106Implementation("com.amazonaws:aws-java-sdk-dynamodb:1.11.0") + test_before_1_11_106Implementation("com.amazonaws:aws-java-sdk-sns:1.11.0") } test { diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle index e68d00a82247..67edd6834432 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle @@ -3,15 +3,15 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { implementation deps.opentelemetryExtAws - library group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0' + library "com.amazonaws:aws-java-sdk-core:1.11.0" testImplementation project(':instrumentation:aws-sdk:aws-sdk-1.11:testing') - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '1.11.106' - testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106' + testLibrary "com.amazonaws:aws-java-sdk-s3:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-rds:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-ec2:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-kinesis:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-dynamodb:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-sns:1.11.106" + testLibrary "com.amazonaws:aws-java-sdk-sqs:1.11.106" } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle index 1a996c3c23ea..6727f7e3f253 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle @@ -3,18 +3,18 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0' + api "com.amazonaws:aws-java-sdk-core:1.11.0" - compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106' - compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106' - compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106' - compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.106' - compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.106' - compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '1.11.106' - compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106' + compileOnly "com.amazonaws:aws-java-sdk-s3:1.11.106" + compileOnly "com.amazonaws:aws-java-sdk-rds:1.11.106" + compileOnly "com.amazonaws:aws-java-sdk-ec2:1.11.106" + compileOnly "com.amazonaws:aws-java-sdk-kinesis:1.11.106" + compileOnly "com.amazonaws:aws-java-sdk-dynamodb:1.11.106" + compileOnly "com.amazonaws:aws-java-sdk-sns:1.11.106" + compileOnly "com.amazonaws:aws-java-sdk-sqs:1.11.106" // needed for SQS - using emq directly as localstack references emq v0.15.7 ie WITHOUT AWS trace header propagation - implementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.12', version: '1.0.0' + implementation "org.elasticmq:elasticmq-rest-sqs_2.12:1.0.0" implementation deps.guava diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle index 5ae12eabe6d7..e9b1cb8b2c36 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle @@ -14,7 +14,7 @@ muzzle { dependencies { implementation project(':instrumentation:aws-sdk:aws-sdk-2.2:library') - library group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0' + library "software.amazon.awssdk:aws-core:2.2.0" testImplementation project(':instrumentation:aws-sdk:aws-sdk-2.2:testing') // Make sure these don't add HTTP headers diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle index 70dbddcb7571..b7d9ee55ac6c 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle @@ -3,8 +3,8 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { implementation deps.opentelemetryExtAws - library group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0' - library group: 'software.amazon.awssdk', name: 'aws-json-protocol', version: '2.2.0' + library "software.amazon.awssdk:aws-core:2.2.0" + library "software.amazon.awssdk:aws-json-protocol:2.2.0" testImplementation project(':instrumentation:aws-sdk:aws-sdk-2.2:testing') diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle index e19e7bda365a..b736afceb9f7 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle @@ -3,13 +3,13 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0' - api group: 'software.amazon.awssdk', name: 's3', version: '2.2.0' - api group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0' - api group: 'software.amazon.awssdk', name: 'ec2', version: '2.2.0' - api group: 'software.amazon.awssdk', name: 'sqs', version: '2.2.0' - api group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.2.0' - api group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0' + api "software.amazon.awssdk:apache-client:2.2.0" + api "software.amazon.awssdk:s3:2.2.0" + api "software.amazon.awssdk:rds:2.2.0" + api "software.amazon.awssdk:ec2:2.2.0" + api "software.amazon.awssdk:sqs:2.2.0" + api "software.amazon.awssdk:dynamodb:2.2.0" + api "software.amazon.awssdk:kinesis:2.2.0" implementation deps.guava diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle b/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle index 2f8c9908bc40..31987bbfcda5 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle @@ -27,10 +27,10 @@ muzzle { } dependencies { - library group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0' + library "com.datastax.cassandra:cassandra-driver-core:3.0.0" - testLibrary group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0' + testLibrary "com.datastax.cassandra:cassandra-driver-core:3.2.0" testInstrumentation project(':instrumentation:guava-10.0:javaagent') - latestDepTestLibrary group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+' + latestDepTestLibrary "com.datastax.cassandra:cassandra-driver-core:3.+" } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/cassandra-4.0-javaagent.gradle b/instrumentation/cassandra/cassandra-4.0/javaagent/cassandra-4.0-javaagent.gradle index 79e0bec1c2c2..cecb03b0a755 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/cassandra-4.0-javaagent.gradle +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/cassandra-4.0-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'com.datastax.oss', name: 'java-driver-core', version: '4.0.0' + library "com.datastax.oss:java-driver-core:4.0.0" - latestDepTestLibrary group: 'com.datastax.oss', name: 'java-driver-core', version: '4.+' + latestDepTestLibrary "com.datastax.oss:java-driver-core:4.+" } diff --git a/instrumentation/cdi-testing/cdi-testing.gradle b/instrumentation/cdi-testing/cdi-testing.gradle index 7daa76e3f888..18173071d3eb 100644 --- a/instrumentation/cdi-testing/cdi-testing.gradle +++ b/instrumentation/cdi-testing/cdi-testing.gradle @@ -4,11 +4,11 @@ ext { apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - testLibrary group: 'org.jboss.weld', name: 'weld-core', version: '2.3.0.Final' - testLibrary group: 'org.jboss.weld.se', name: 'weld-se', version: '2.3.0.Final' - testLibrary group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.3.0.Final' + testLibrary "org.jboss.weld:weld-core:2.3.0.Final" + testLibrary "org.jboss.weld.se:weld-se:2.3.0.Final" + testLibrary "org.jboss.weld.se:weld-se-core:2.3.0.Final" - latestDepTestLibrary group: 'org.jboss.weld', name: 'weld-core', version: '2.+' - latestDepTestLibrary group: 'org.jboss.weld.se', name: 'weld-se', version: '2.+' - latestDepTestLibrary group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+' + latestDepTestLibrary "org.jboss.weld:weld-core:2.+" + latestDepTestLibrary "org.jboss.weld.se:weld-se:2.+" + latestDepTestLibrary "org.jboss.weld.se:weld-se-core:2.+" } diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle b/instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle index b3c428856f0d..31e3ad4e95bf 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle +++ b/instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle @@ -6,5 +6,5 @@ dependencies { testImplementation project(':instrumentation-api') testImplementation project(':instrumentation:couchbase:couchbase-2.0:javaagent') - testImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.5.0' + testImplementation "com.couchbase.client:java-client:2.5.0" } diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle b/instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle index f296dc0f7bdf..86dc4e7da3f0 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle @@ -28,10 +28,10 @@ muzzle { dependencies { implementation project(':instrumentation:rxjava:rxjava-1.0:library') - library group: 'com.couchbase.client', name: 'java-client', version: '2.0.0' + library "com.couchbase.client:java-client:2.0.0" testImplementation project(':instrumentation:couchbase:couchbase-testing') - latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.+' - latestDepTestLibrary group: 'com.couchbase.client', name: 'java-client', version: '2.+' + latestDepTestLibrary "org.springframework.data:spring-data-couchbase:3.+" + latestDepTestLibrary "com.couchbase.client:java-client:2.+" } diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle b/instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle index 58d342b4dd7a..9370ca9c4f4e 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle @@ -19,16 +19,16 @@ muzzle { dependencies { implementation project(':instrumentation:rxjava:rxjava-1.0:library') - library group: 'com.couchbase.client', name: 'java-client', version: '2.6.0' + library "com.couchbase.client:java-client:2.6.0" testInstrumentation project(':instrumentation:couchbase:couchbase-2.0:javaagent') testImplementation project(':instrumentation:couchbase:couchbase-testing') - testLibrary group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1.0.RELEASE' - testLibrary group: 'com.couchbase.client', name: 'encryption', version: '1.0.0' + testLibrary "org.springframework.data:spring-data-couchbase:3.1.0.RELEASE" + testLibrary "com.couchbase.client:encryption:1.0.0" - latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1+' - latestDepTestLibrary group: 'com.couchbase.client', name: 'java-client', version: '2.+' + latestDepTestLibrary "org.springframework.data:spring-data-couchbase:3.1+" + latestDepTestLibrary "com.couchbase.client:java-client:2.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/couchbase-3.1-javaagent.gradle b/instrumentation/couchbase/couchbase-3.1/javaagent/couchbase-3.1-javaagent.gradle index 8ebbf7f23006..3fd6ae864f2f 100644 --- a/instrumentation/couchbase/couchbase-3.1/javaagent/couchbase-3.1-javaagent.gradle +++ b/instrumentation/couchbase/couchbase-3.1/javaagent/couchbase-3.1-javaagent.gradle @@ -12,13 +12,13 @@ muzzle { } dependencies { - implementation(group: "com.couchbase.client", name: "tracing-opentelemetry", version: "0.3.3") { + implementation("com.couchbase.client:tracing-opentelemetry:0.3.3") { exclude(group: "com.couchbase.client", module: "core-io") } - library group: "com.couchbase.client", name: "core-io", version: "2.1.0" + library "com.couchbase.client:core-io:2.1.0" - testLibrary group: "com.couchbase.client", name: "java-client", version: "3.1.0" + testLibrary "com.couchbase.client:java-client:3.1.0" testImplementation group: "org.testcontainers", name: "couchbase", version: versions.testcontainers } \ No newline at end of file diff --git a/instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle b/instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle index 5f8414f9e7d4..3075517866ad 100644 --- a/instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle +++ b/instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle @@ -3,10 +3,10 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'com.couchbase.mock', name: 'CouchbaseMock', version: '1.5.19' + api "com.couchbase.mock:CouchbaseMock:1.5.19" // Earliest version that seems to allow queries with CouchbaseMock: - api group: 'com.couchbase.client', name: 'java-client', version: '2.5.0' - api group: 'org.springframework.data', name: 'spring-data-couchbase', version: '2.0.0.RELEASE' + api "com.couchbase.client:java-client:2.5.0" + api "org.springframework.data:spring-data-couchbase:2.0.0.RELEASE" implementation deps.groovy implementation deps.opentelemetryApi diff --git a/instrumentation/dropwizard-testing/dropwizard-testing.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle index cb3b867d8042..c48e3b2b300c 100644 --- a/instrumentation/dropwizard-testing/dropwizard-testing.gradle +++ b/instrumentation/dropwizard-testing/dropwizard-testing.gradle @@ -8,7 +8,7 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') // First version with DropwizardTestSupport: - testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - testImplementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10' + testImplementation "io.dropwizard:dropwizard-testing:0.8.0" + testImplementation "javax.xml.bind:jaxb-api:2.2.3" + testImplementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.9.10" } diff --git a/instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle b/instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle index 51eac72cde9f..4149e7385dce 100644 --- a/instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle +++ b/instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle @@ -9,8 +9,8 @@ muzzle { } dependencies { - compileOnly group: 'io.dropwizard', name: 'dropwizard-views', version: '0.7.0' + compileOnly "io.dropwizard:dropwizard-views:0.7.0" - testImplementation group: 'io.dropwizard', name: 'dropwizard-views-freemarker', version: '0.7.0' - testImplementation group: 'io.dropwizard', name: 'dropwizard-views-mustache', version: '0.7.0' + testImplementation "io.dropwizard:dropwizard-views-freemarker:0.7.0" + testImplementation "io.dropwizard:dropwizard-views-mustache:0.7.0" } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle index 6cd9494fd898..a06debd19de3 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle @@ -21,23 +21,23 @@ testSets { } dependencies { - compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' + compileOnly "org.elasticsearch.client:rest:5.0.0" implementation project(':instrumentation:elasticsearch:elasticsearch-rest-common:library') testInstrumentation project(':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent') testInstrumentation project(':instrumentation:apache-httpasyncclient-4.1:javaagent') - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' + testImplementation "org.apache.logging.log4j:log4j-core:2.11.0" + testImplementation "org.apache.logging.log4j:log4j-api:2.11.0" - testImplementation group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' - testImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '5.0.0' - testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.0.0' + testImplementation "org.elasticsearch.client:rest:5.0.0" + testImplementation "org.elasticsearch:elasticsearch:5.0.0" + testImplementation "org.elasticsearch.plugin:transport-netty3-client:5.0.0" - latestDepTestImplementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.3.+' - latestDepTestImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '6.3.+' - latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.3.+' + latestDepTestImplementation "org.elasticsearch.client:elasticsearch-rest-client:6.3.+" + latestDepTestImplementation "org.elasticsearch:elasticsearch:6.3.+" + latestDepTestImplementation "org.elasticsearch.plugin:transport-netty4-client:6.3.+" } configurations.latestDepTestImplementation { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle index 497d4bf13e65..0f0b60dbc718 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle @@ -16,7 +16,7 @@ muzzle { } dependencies { - library group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.4.0' + library "org.elasticsearch.client:elasticsearch-rest-client:6.4.0" implementation project(':instrumentation:elasticsearch:elasticsearch-rest-common:library') @@ -26,14 +26,14 @@ dependencies { // Netty is used, but it adds complexity to the tests since we're using embedded ES. //testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' + testImplementation "org.apache.logging.log4j:log4j-core:2.11.0" + testImplementation "org.apache.logging.log4j:log4j-api:2.11.0" - testLibrary group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.4.0' - testLibrary group: 'org.elasticsearch', name: 'elasticsearch', version: '6.4.0' - testLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.4.0' + testLibrary "org.elasticsearch.client:elasticsearch-rest-client:6.4.0" + testLibrary "org.elasticsearch:elasticsearch:6.4.0" + testLibrary "org.elasticsearch.plugin:transport-netty4-client:6.4.0" - latestDepTestLibrary group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.+' - latestDepTestLibrary group: 'org.elasticsearch', name: 'elasticsearch', version: '6.+' - latestDepTestLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.+' + latestDepTestLibrary "org.elasticsearch.client:elasticsearch-rest-client:6.+" + latestDepTestLibrary "org.elasticsearch:elasticsearch:6.+" + latestDepTestLibrary "org.elasticsearch.plugin:transport-netty4-client:6.+" } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/elasticsearch-rest-7.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/elasticsearch-rest-7.0-javaagent.gradle index 47fdde48da36..0f7cb2454a36 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/elasticsearch-rest-7.0-javaagent.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/elasticsearch-rest-7.0-javaagent.gradle @@ -16,7 +16,7 @@ muzzle { } dependencies { - library group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '7.0.0' + library "org.elasticsearch.client:elasticsearch-rest-client:7.0.0" implementation project(':instrumentation:elasticsearch:elasticsearch-rest-common:library') @@ -26,9 +26,9 @@ dependencies { // Netty is used, but it adds complexity to the tests since we're using embedded ES. //testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' + testImplementation "org.apache.logging.log4j:log4j-core:2.11.0" + testImplementation "org.apache.logging.log4j:log4j-api:2.11.0" - testLibrary group: 'org.elasticsearch', name: 'elasticsearch', version: '7.0.0' - testLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '7.0.0' + testLibrary "org.elasticsearch:elasticsearch:7.0.0" + testLibrary "org.elasticsearch.plugin:transport-netty4-client:7.0.0" } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle b/instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle index 56ed61e9e6a0..e27bc1b49d1a 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' + compileOnly "org.elasticsearch.client:rest:5.0.0" } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle index c67a6c229848..20398c78d28b 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle @@ -22,7 +22,7 @@ muzzle { } dependencies { - compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0' + compileOnly "org.elasticsearch.client:transport:5.0.0" implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common:library') @@ -31,11 +31,11 @@ dependencies { testInstrumentation project(':instrumentation:apache-httpasyncclient-4.1:javaagent') testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' + testImplementation "org.apache.logging.log4j:log4j-core:2.11.0" + testImplementation "org.apache.logging.log4j:log4j-api:2.11.0" - testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.0.0' - testImplementation group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0' + testImplementation "org.elasticsearch.plugin:transport-netty3-client:5.0.0" + testImplementation "org.elasticsearch.client:transport:5.0.0" } tasks.withType(Test).configureEach { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle index b79f796fe565..ec909457521e 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle @@ -22,7 +22,7 @@ muzzle { } dependencies { - library group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0' + library "org.elasticsearch.client:transport:5.3.0" implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common:library') @@ -30,17 +30,17 @@ dependencies { testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') testInstrumentation project(':instrumentation:spring:spring-data-1.8:javaagent') - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' + testImplementation "org.apache.logging.log4j:log4j-core:2.11.0" + testImplementation "org.apache.logging.log4j:log4j-api:2.11.0" - testLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.3.0' + testLibrary "org.elasticsearch.plugin:transport-netty3-client:5.3.0" // Unfortunately this will bump the transport version up to 5.5.0. - testLibrary group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.0.RELEASE' + testLibrary "org.springframework.data:spring-data-elasticsearch:3.0.0.RELEASE" - latestDepTestLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.+' - latestDepTestLibrary group: 'org.elasticsearch.client', name: 'transport', version: '5.+' - latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.+' + latestDepTestLibrary "org.elasticsearch.plugin:transport-netty3-client:5.+" + latestDepTestLibrary "org.elasticsearch.client:transport:5.+" + latestDepTestLibrary "org.springframework.data:spring-data-elasticsearch:3.0.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle index 36655d08e04a..3f6476fd0dc8 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle @@ -22,7 +22,7 @@ muzzle { } dependencies { - library group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0' + library "org.elasticsearch.client:transport:6.0.0" implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common:library') @@ -31,10 +31,10 @@ dependencies { testInstrumentation project(':instrumentation:apache-httpasyncclient-4.1:javaagent') testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') - testLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0' + testLibrary "org.elasticsearch.plugin:transport-netty4-client:6.0.0" - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' + testImplementation "org.apache.logging.log4j:log4j-core:2.11.0" + testImplementation "org.apache.logging.log4j:log4j-api:2.11.0" } tasks.withType(Test).configureEach { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/library/elasticsearch-transport-common-library.gradle b/instrumentation/elasticsearch/elasticsearch-transport-common/library/elasticsearch-transport-common-library.gradle index df6d28cf0867..96bb7d5c42e9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/library/elasticsearch-transport-common-library.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/library/elasticsearch-transport-common-library.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0' + compileOnly "org.elasticsearch:elasticsearch:2.0.0" } diff --git a/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle b/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle index 5860254db032..6728964f37bd 100644 --- a/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle +++ b/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle @@ -9,19 +9,19 @@ muzzle { dependencies { compileOnly project(':javaagent-tooling') - testImplementation group: 'com.newrelic.agent.java', name: 'newrelic-api', version: '5.14.0' - testImplementation(group: 'io.opentracing.contrib.dropwizard', name: 'dropwizard-opentracing', version: '0.2.2') { + testImplementation "com.newrelic.agent.java:newrelic-api:5.14.0" + testImplementation("io.opentracing.contrib.dropwizard:dropwizard-opentracing:0.2.2") { transitive = false } - testImplementation group: 'com.signalfx.public', name: 'signalfx-trace-api', version: '0.48.0-sfx1' + testImplementation "com.signalfx.public:signalfx-trace-api:0.48.0-sfx1" //Old and new versions of kamon use different packages for Trace annotation - testImplementation(group: 'io.kamon', name: 'kamon-annotation_2.11', version: '0.6.7') { + testImplementation("io.kamon:kamon-annotation_2.11:0.6.7") { transitive = false } - testImplementation group: 'io.kamon', name: 'kamon-annotation-api', version: '2.1.4' - testImplementation group: 'com.appoptics.agent.java', name: 'appoptics-sdk', version: '6.20.1' - testImplementation group: 'com.tracelytics.agent.java', name: 'tracelytics-api', version: '5.0.10' - testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-sleuth-core', version: '2.2.4.RELEASE') { + testImplementation "io.kamon:kamon-annotation-api:2.1.4" + testImplementation "com.appoptics.agent.java:appoptics-sdk:6.20.1" + testImplementation "com.tracelytics.agent.java:tracelytics-api:5.0.10" + testImplementation("org.springframework.cloud:spring-cloud-sleuth-core:2.2.4.RELEASE") { transitive = false } } diff --git a/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle b/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle index febf1014875a..38baf1b5c08a 100644 --- a/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle +++ b/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle @@ -26,16 +26,16 @@ muzzle { dependencies { // TODO(anuraaga): Something about library configuration doesn't work well with scala compilation // here. - compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0' + compileOnly "com.twitter:finatra-http_2.11:2.9.0" testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') - testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0' - testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10' + testImplementation "com.twitter:finatra-http_2.11:19.12.0" + testImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.10" // Required for older versions of finatra on JDKs >= 11 - testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0' + testImplementation "com.sun.activation:javax.activation:1.2.0" - latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+' + latestDepTestImplementation "com.twitter:finatra-http_2.11:+" } compileLatestDepTestGroovy { diff --git a/instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle b/instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle index 936fd7d6b784..d0da28497dd7 100644 --- a/instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle +++ b/instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle @@ -9,5 +9,5 @@ muzzle { } dependencies { - library group: 'org.apache.geode', name: 'geode-core', version: '1.4.0' + library "org.apache.geode:geode-core:1.4.0" } diff --git a/instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle b/instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle index fe91fd200cfa..8be9f73c922c 100644 --- a/instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle +++ b/instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle @@ -11,5 +11,5 @@ muzzle { } dependencies { - library group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0' + library "com.google.http-client:google-http-client:1.19.0" } diff --git a/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle b/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle index ccf961ab67a0..a378c512e2e4 100644 --- a/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle +++ b/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle @@ -10,14 +10,14 @@ muzzle { } dependencies { - compileOnly group: 'org.glassfish.grizzly', name: 'grizzly-http', version: '2.0' + compileOnly "org.glassfish.grizzly:grizzly-http:2.0" - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - testImplementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' - testLibrary group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.0' + testImplementation "javax.xml.bind:jaxb-api:2.2.3" + testImplementation "javax.ws.rs:javax.ws.rs-api:2.0" + testLibrary "org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.0" - latestDepTestLibrary group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.+' - latestDepTestLibrary group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+' + latestDepTestLibrary "org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.+" + latestDepTestLibrary "org.glassfish.jersey.inject:jersey-hk2:2.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle b/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle index f5b6db610c6d..767f25e8bd36 100644 --- a/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle +++ b/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle @@ -30,12 +30,12 @@ def grpcVersion = '1.6.0' dependencies { implementation project(':instrumentation:grpc-1.6:library') - library group: 'io.grpc', name: 'grpc-core', version: grpcVersion + library "io.grpc:grpc-core:${grpcVersion}" - testLibrary group: 'io.grpc', name: 'grpc-netty', version: grpcVersion - testLibrary group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion - testLibrary group: 'io.grpc', name: 'grpc-services', version: grpcVersion - testLibrary group: 'io.grpc', name: 'grpc-stub', version: grpcVersion + testLibrary "io.grpc:grpc-netty:${grpcVersion}" + testLibrary "io.grpc:grpc-protobuf:${grpcVersion}" + testLibrary "io.grpc:grpc-services:${grpcVersion}" + testLibrary "io.grpc:grpc-stub:${grpcVersion}" testImplementation project(':instrumentation:grpc-1.6:testing') } diff --git a/instrumentation/grpc-1.6/library/grpc-1.6-library.gradle b/instrumentation/grpc-1.6/library/grpc-1.6-library.gradle index e8499d5e2632..5c0ac2180646 100644 --- a/instrumentation/grpc-1.6/library/grpc-1.6-library.gradle +++ b/instrumentation/grpc-1.6/library/grpc-1.6-library.gradle @@ -3,12 +3,12 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" def grpcVersion = '1.6.0' dependencies { - library group: 'io.grpc', name: 'grpc-core', version: grpcVersion + library "io.grpc:grpc-core:${grpcVersion}" - testLibrary group: 'io.grpc', name: 'grpc-netty', version: grpcVersion - testLibrary group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion - testLibrary group: 'io.grpc', name: 'grpc-services', version: grpcVersion - testLibrary group: 'io.grpc', name: 'grpc-stub', version: grpcVersion + testLibrary "io.grpc:grpc-netty:${grpcVersion}" + testLibrary "io.grpc:grpc-protobuf:${grpcVersion}" + testLibrary "io.grpc:grpc-services:${grpcVersion}" + testLibrary "io.grpc:grpc-stub:${grpcVersion}" testImplementation deps.assertj testImplementation project(':instrumentation:grpc-1.6:testing') diff --git a/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle b/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle index babb7ec60415..e1e4c9362cd3 100644 --- a/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle +++ b/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle @@ -23,12 +23,12 @@ protobuf { dependencies { api project(':testing-common') - api group: 'io.grpc', name: 'grpc-core', version: grpcVersion - api group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion - api group: 'io.grpc', name: 'grpc-services', version: grpcVersion - api group: 'io.grpc', name: 'grpc-stub', version: grpcVersion + api "io.grpc:grpc-core:${grpcVersion}" + api "io.grpc:grpc-protobuf:${grpcVersion}" + api "io.grpc:grpc-services:${grpcVersion}" + api "io.grpc:grpc-stub:${grpcVersion}" - implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' + implementation "javax.annotation:javax.annotation-api:1.3.2" implementation deps.guava diff --git a/instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle b/instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle index 29620bec7d09..9a2e485019e2 100644 --- a/instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle +++ b/instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'com.google.guava', name: 'guava', version: '10.0' + library "com.google.guava:guava:10.0" implementation project(':instrumentation:guava-10.0:library') diff --git a/instrumentation/guava-10.0/library/guava-10.0-library.gradle b/instrumentation/guava-10.0/library/guava-10.0-library.gradle index 360e3f8b70ef..6d2f5da94633 100644 --- a/instrumentation/guava-10.0/library/guava-10.0-library.gradle +++ b/instrumentation/guava-10.0/library/guava-10.0-library.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'com.google.guava', name: 'guava', version: '10.0' + library "com.google.guava:guava:10.0" } \ No newline at end of file diff --git a/instrumentation/gwt-2.0/javaagent/gwt-2.0-javaagent.gradle b/instrumentation/gwt-2.0/javaagent/gwt-2.0-javaagent.gradle index bd1990630b3d..6e19eab8f1fa 100644 --- a/instrumentation/gwt-2.0/javaagent/gwt-2.0-javaagent.gradle +++ b/instrumentation/gwt-2.0/javaagent/gwt-2.0-javaagent.gradle @@ -42,7 +42,7 @@ dependencies { testImplementation(project(':testing-common')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.4.35.v20201120' + testImplementation "org.eclipse.jetty:jetty-webapp:9.4.35.v20201120" } def warDir = "$buildDir/testapp/war" diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle b/instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle index b4d9a8b52700..a33674637294 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle @@ -17,7 +17,7 @@ muzzle { } dependencies { - library group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.GA' + library "org.hibernate:hibernate-core:3.3.0.GA" implementation project(':instrumentation:hibernate:hibernate-common:javaagent') @@ -26,16 +26,16 @@ dependencies { testInstrumentation project(':instrumentation:hibernate:hibernate-4.0:javaagent') testInstrumentation project(':instrumentation:hibernate:hibernate-4.3:javaagent') - testLibrary group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.SP1' - testImplementation group: 'org.hibernate', name: 'hibernate-annotations', version: '3.4.0.GA' - testImplementation group: 'javassist', name: 'javassist', version: '+' - testImplementation group: 'com.h2database', name: 'h2', version: '1.4.197' + testLibrary "org.hibernate:hibernate-core:3.3.0.SP1" + testImplementation "org.hibernate:hibernate-annotations:3.4.0.GA" + testImplementation "javassist:javassist:+" + testImplementation "com.h2database:h2:1.4.197" testImplementation "javax.xml.bind:jaxb-api:2.2.11" testImplementation "com.sun.xml.bind:jaxb-core:2.2.11" testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11" testImplementation "javax.activation:activation:1.1.1" - latestDepTestLibrary group: 'org.hibernate', name: 'hibernate-core', version: '3.+' + latestDepTestLibrary "org.hibernate:hibernate-core:3.+" } if (findProperty('testLatestDeps')) { diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle b/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle index fac6229a3623..ec91ff6fdaf3 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final' + library "org.hibernate:hibernate-core:4.0.0.Final" implementation project(':instrumentation:hibernate:hibernate-common:javaagent') @@ -19,11 +19,11 @@ dependencies { testInstrumentation project(':instrumentation:hibernate:hibernate-3.3:javaagent') testInstrumentation project(':instrumentation:hibernate:hibernate-4.3:javaagent') - testImplementation group: 'com.h2database', name: 'h2', version: '1.4.197' + testImplementation "com.h2database:h2:1.4.197" testImplementation "javax.xml.bind:jaxb-api:2.2.11" testImplementation "com.sun.xml.bind:jaxb-core:2.2.11" testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11" testImplementation "javax.activation:activation:1.1.1" - latestDepTestLibrary group: 'org.hibernate', name: 'hibernate-core', version: '4.2.+' + latestDepTestLibrary "org.hibernate:hibernate-core:4.2.+" } diff --git a/instrumentation/hibernate/hibernate-4.3/javaagent/hibernate-4.3-javaagent.gradle b/instrumentation/hibernate/hibernate-4.3/javaagent/hibernate-4.3-javaagent.gradle index 9d04081a95a3..f340c1012f76 100644 --- a/instrumentation/hibernate/hibernate-4.3/javaagent/hibernate-4.3-javaagent.gradle +++ b/instrumentation/hibernate/hibernate-4.3/javaagent/hibernate-4.3-javaagent.gradle @@ -26,7 +26,7 @@ testSets { test.dependsOn version5Test, version6Test dependencies { - compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final' + compileOnly "org.hibernate:hibernate-core:4.3.0.Final" implementation project(':instrumentation:hibernate:hibernate-common:javaagent') @@ -35,26 +35,26 @@ dependencies { testInstrumentation project(':instrumentation:hibernate:hibernate-3.3:javaagent') testInstrumentation project(':instrumentation:hibernate:hibernate-4.0:javaagent') - testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final' - testImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final' - testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0' + testImplementation "org.hibernate:hibernate-core:4.3.0.Final" + testImplementation "org.hibernate:hibernate-entitymanager:4.3.0.Final" + testImplementation "org.hsqldb:hsqldb:2.0.0" //First version to work with Java 14 - testImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.8.0.RELEASE' + testImplementation "org.springframework.data:spring-data-jpa:1.8.0.RELEASE" - version5TestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '5.0.0.Final' - version5TestImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '5.0.0.Final' - version5TestImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '2.3.0.RELEASE' + version5TestImplementation "org.hibernate:hibernate-core:5.0.0.Final" + version5TestImplementation "org.hibernate:hibernate-entitymanager:5.0.0.Final" + version5TestImplementation "org.springframework.data:spring-data-jpa:2.3.0.RELEASE" - version6TestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '6.0.0.Alpha6' - version6TestImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '6.0.0.Alpha6' - version6TestImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '2.3.0.RELEASE' + version6TestImplementation "org.hibernate:hibernate-core:6.0.0.Alpha6" + version6TestImplementation "org.hibernate:hibernate-entitymanager:6.0.0.Alpha6" + version6TestImplementation "org.springframework.data:spring-data-jpa:2.3.0.RELEASE" - testImplementation group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - testImplementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3' + testImplementation "javax.activation:javax.activation-api:1.2.0" + testImplementation "javax.xml.bind:jaxb-api:2.3.1" + testImplementation "org.glassfish.jaxb:jaxb-runtime:2.3.3" // hibernate 6 is alpha so use 5 as latest version - latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '5.+' - latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '5.+' - latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '(2.4.0,)' + latestDepTestImplementation "org.hibernate:hibernate-core:5.+" + latestDepTestImplementation "org.hibernate:hibernate-entitymanager:5.+" + latestDepTestImplementation "org.springframework.data:spring-data-jpa:(2.4.0,)" } diff --git a/instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle b/instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle index 0b7256c0a4df..a285a48469a8 100644 --- a/instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle +++ b/instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle @@ -7,5 +7,5 @@ muzzle { } dependencies { - testImplementation group: 'org.springframework', name: 'spring-web', version: '4.3.7.RELEASE' + testImplementation "org.springframework:spring-web:4.3.7.RELEASE" } diff --git a/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle b/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle index 31ae162e0865..e1fb82e7b3e3 100644 --- a/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle +++ b/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle @@ -11,8 +11,8 @@ muzzle { dependencies { implementation project(':instrumentation:rxjava:rxjava-1.0:library') - library group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0' - library group: 'io.reactivex', name: 'rxjava', version: '1.0.7' + library "com.netflix.hystrix:hystrix-core:1.4.0" + library "io.reactivex:rxjava:1.0.7" } tasks.withType(Test).configureEach { diff --git a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/internal-class-loader-javaagent-integration-tests.gradle b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/internal-class-loader-javaagent-integration-tests.gradle index b924e04b9378..ee94ea1d990b 100644 --- a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/internal-class-loader-javaagent-integration-tests.gradle +++ b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/internal-class-loader-javaagent-integration-tests.gradle @@ -3,7 +3,7 @@ ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - testImplementation group: "org.apache.commons", name: "commons-lang3", version: "3.12.0" + testImplementation "org.apache.commons:commons-lang3:3.12.0" testInstrumentation project(":instrumentation:internal:internal-class-loader:javaagent") } diff --git a/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle b/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle index 7e96eac0e699..024c6a83bf5b 100644 --- a/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle +++ b/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle @@ -8,14 +8,14 @@ dependencies { // This is the earliest version that has org.apache.catalina.loader.ParallelWebappClassLoader // which is used in the test - testLibrary group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14' + testLibrary "org.apache.tomcat:tomcat-catalina:8.0.14" - testImplementation group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final' + testImplementation "org.jboss.modules:jboss-modules:1.3.10.Final" // TODO: we should separate core and Eclipse tests at some point, // but right now core-specific tests are quite dumb and are run with // core version provided by Eclipse implementation. - //testImplementation group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0' - testImplementation group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200' - testImplementation group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2' + //testImplementation "org.osgi:org.osgi.core:4.0.0" + testImplementation "org.eclipse.platform:org.eclipse.osgi:3.13.200" + testImplementation "org.apache.felix:org.apache.felix.framework:6.0.2" } diff --git a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle index 52a48d6326fb..f34888e862f3 100644 --- a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle +++ b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle @@ -3,8 +3,8 @@ ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - testImplementation group: "org.apache.commons", name: "commons-lang3", version: "3.12.0" - testImplementation group: "commons-io", name: "commons-io", version: "2.8.0" + testImplementation "org.apache.commons:commons-lang3:3.12.0" + testImplementation "commons-io:commons-io:2.8.0" testInstrumentation project(":instrumentation:internal:internal-url-class-loader:javaagent") } diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle index 9c7dc3ef775b..aac7acf30950 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle @@ -10,5 +10,5 @@ muzzle { } dependencies { - library group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4' + library "com.sun.jersey:jersey-client:1.1.4" } diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle index cadc1769ef18..4aeab2a5a7b2 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle @@ -16,27 +16,27 @@ muzzle { } dependencies { - compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1' - compileOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' + compileOnly "javax.ws.rs:javax.ws.rs-api:2.0.1" + compileOnly "javax.annotation:javax.annotation-api:1.3.2" testInstrumentation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-cxf-3.0:javaagent') testInstrumentation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-jersey-2.0:javaagent') testInstrumentation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-resteasy-3.0:javaagent') - testImplementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1' + testImplementation "javax.ws.rs:javax.ws.rs-api:2.0.1" - testLibrary group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0' - testLibrary group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.5.Final' + testLibrary "org.glassfish.jersey.core:jersey-client:2.0" + testLibrary "org.jboss.resteasy:resteasy-client:3.0.5.Final" // ^ This version has timeouts https://issues.redhat.com/browse/RESTEASY-975 - testLibrary group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.1.0' + testLibrary "org.apache.cxf:cxf-rt-rs-client:3.1.0" // Doesn't work with CXF 3.0.x because their context is wrong: // https://github.com/apache/cxf/commit/335c7bad2436f08d6d54180212df5a52157c9f21 - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' + testImplementation "javax.xml.bind:jaxb-api:2.2.3" testInstrumentation project(':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent') - latestDepTestLibrary group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+' - latestDepTestLibrary group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.+' - latestDepTestLibrary group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.26.Final' + latestDepTestLibrary "org.glassfish.jersey.inject:jersey-hk2:2.+" + latestDepTestLibrary "org.glassfish.jersey.core:jersey-client:2.+" + latestDepTestLibrary "org.jboss.resteasy:resteasy-client:3.0.26.Final" } diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle index 5de004e9aa23..75a69df6b7ea 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle @@ -9,7 +9,7 @@ muzzle { } dependencies { - library group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.0.0' + library "org.apache.cxf:cxf-rt-rs-client:3.0.0" implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common:javaagent') } diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle index 7d1476377083..53b45f517af2 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle @@ -9,7 +9,7 @@ muzzle { } dependencies { - library group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0' + library "org.glassfish.jersey.core:jersey-client:2.0" implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common:javaagent') } diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle index 9134c6bde774..3794f168e421 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle @@ -25,7 +25,7 @@ dependencies { // putSingle(String, Object) is a generic implementation for // javax.ws.rs.core.MultivaluedMap.putSingle(K, V), and so there's also a synthetic bridge method // putSingle(Object, Object) in those versions - library group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.10.Final' + library "org.jboss.resteasy:resteasy-client:3.0.10.Final" implementation project(':instrumentation:jaxrs-client:jaxrs-client-2.0:jaxrs-client-2.0-common:javaagent') } diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle b/instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle index e8d66fa759df..9f4a93aa82cc 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle @@ -14,8 +14,8 @@ muzzle { } dependencies { - compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1' + compileOnly "javax.ws.rs:jsr311-api:1.1.1" - testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.7.1' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' + testImplementation "io.dropwizard:dropwizard-testing:0.7.1" + testImplementation "javax.xml.bind:jaxb-api:2.2.3" } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle index 83b2eb2a8c9e..24ae9c352673 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle @@ -14,5 +14,5 @@ muzzle { } dependencies { - compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' + compileOnly "javax.ws.rs:javax.ws.rs-api:2.0" } \ No newline at end of file diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle index a760568223dd..83757b290ae5 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle @@ -19,9 +19,9 @@ muzzle { } dependencies { - compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' - library group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxrs', version: '3.2.0' + compileOnly "javax.ws.rs:javax.ws.rs-api:2.0" + compileOnly "javax.servlet:javax.servlet-api:3.1.0" + library "org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0" implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') @@ -29,13 +29,13 @@ dependencies { testInstrumentation project(':instrumentation:jetty:jetty-8.0:javaagent') testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing') - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.4.6.v20170531' + testImplementation "javax.xml.bind:jaxb-api:2.2.3" + testImplementation "org.eclipse.jetty:jetty-webapp:9.4.6.v20170531" - testLibrary group: 'org.apache.cxf', name: 'cxf-rt-transports-http-jetty', version: '3.2.0' - testLibrary group: 'org.apache.cxf', name: 'cxf-rt-ws-policy', version: '3.2.0' + testLibrary "org.apache.cxf:cxf-rt-transports-http-jetty:3.2.0" + testLibrary "org.apache.cxf:cxf-rt-ws-policy:3.2.0" - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.+' + latestDepTestLibrary "org.eclipse.jetty:jetty-webapp:9.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle index c13eafb7cf4b..d1d7b78f471a 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle @@ -18,10 +18,10 @@ muzzle { } dependencies { - compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' - library group: 'org.glassfish.jersey.core', name: 'jersey-server', version: '2.0' - library group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet', version: '2.0' + compileOnly "javax.ws.rs:javax.ws.rs-api:2.0" + compileOnly "javax.servlet:javax.servlet-api:3.1.0" + library "org.glassfish.jersey.core:jersey-server:2.0" + library "org.glassfish.jersey.containers:jersey-container-servlet:2.0" implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') @@ -31,15 +31,15 @@ dependencies { testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing') // First version with DropwizardTestSupport: - testLibrary group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - testImplementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10' + testLibrary "io.dropwizard:dropwizard-testing:0.8.0" + testImplementation "javax.xml.bind:jaxb-api:2.2.3" + testImplementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.9.10" - latestDepTestLibrary group: 'org.glassfish.jersey.core', name: 'jersey-server', version: '2.+' - latestDepTestLibrary group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet', version: '2.+' + latestDepTestLibrary "org.glassfish.jersey.core:jersey-server:2.+" + latestDepTestLibrary "org.glassfish.jersey.containers:jersey-container-servlet:2.+" // this is needed because dropwizard-testing version 0.8.0 (above) pulls it in transitively, // but the latest version of dropwizard-testing does not - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.+' + latestDepTestLibrary "org.eclipse.jetty:jetty-webapp:9.+" } test { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle index 740dc1a33e66..98adde4a4a88 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle @@ -21,8 +21,8 @@ muzzle { } dependencies { - compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' - library group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final' + compileOnly "javax.ws.rs:javax.ws.rs-api:2.0" + library "org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final" implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent') @@ -31,16 +31,16 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing') - testImplementation group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.4.6.v20170531' + testImplementation "org.eclipse.jetty:jetty-webapp:9.4.6.v20170531" - testLibrary(group: 'org.jboss.resteasy', name: 'resteasy-undertow', version: '3.0.4.Final') { + testLibrary("org.jboss.resteasy:resteasy-undertow:3.0.4.Final") { exclude group: 'org.jboss.resteasy', module: 'resteasy-client' } - testLibrary group: 'io.undertow', name: 'undertow-servlet', version: '1.0.0.Final' - testLibrary group: 'org.jboss.resteasy', name: 'resteasy-servlet-initializer', version: '3.0.4.Final' + testLibrary "io.undertow:undertow-servlet:1.0.0.Final" + testLibrary "org.jboss.resteasy:resteasy-servlet-initializer:3.0.4.Final" - latestDepTestLibrary group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.+' - latestDepTestLibrary(group: 'org.jboss.resteasy', name: 'resteasy-undertow', version: '3.+') { + latestDepTestLibrary "org.jboss.resteasy:resteasy-jaxrs:3.+" + latestDepTestLibrary("org.jboss.resteasy:resteasy-undertow:3.+") { exclude group: 'org.jboss.resteasy', module: 'resteasy-client' } } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle index f2c436ca3a62..a137854dcef9 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle @@ -21,8 +21,8 @@ muzzle { } dependencies { - compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' - library group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.1.0.Final' + compileOnly "javax.ws.rs:javax.ws.rs-api:2.0" + library "org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final" implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent') @@ -31,15 +31,15 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing') - testImplementation group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.4.6.v20170531' + testImplementation "org.eclipse.jetty:jetty-webapp:9.4.6.v20170531" - testLibrary(group: 'org.jboss.resteasy', name: 'resteasy-undertow', version: '3.1.0.Final') { + testLibrary("org.jboss.resteasy:resteasy-undertow:3.1.0.Final") { exclude group: 'org.jboss.resteasy', module: 'resteasy-client' } - testLibrary group: 'org.jboss.resteasy', name: 'resteasy-servlet-initializer', version: '3.1.0.Final' + testLibrary "org.jboss.resteasy:resteasy-servlet-initializer:3.1.0.Final" // artifact name changed from 'resteasy-jaxrs' to 'resteasy-core' starting from version 4.0.0 - latestDepTestLibrary group: 'org.jboss.resteasy', name: 'resteasy-core', version: '+' + latestDepTestLibrary "org.jboss.resteasy:resteasy-core:+" } test { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/jaxrs-2.0-resteasy-common-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/jaxrs-2.0-resteasy-common-javaagent.gradle index 4328306d8e14..b3057f51b517 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/jaxrs-2.0-resteasy-common-javaagent.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/jaxrs-2.0-resteasy-common-javaagent.gradle @@ -1,8 +1,8 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' - compileOnly group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.1.0.Final' + compileOnly "javax.ws.rs:javax.ws.rs-api:2.0" + compileOnly "org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final" implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') } \ No newline at end of file diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle index 13bbc3deaaaa..53ed2146807d 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' + api "javax.ws.rs:javax.ws.rs-api:2.0" implementation deps.groovy implementation deps.opentelemetryApi @@ -14,5 +14,5 @@ dependencies { implementation project(':instrumentation-api') implementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') - compileOnly group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '8.0.0.v20110901' + compileOnly "org.eclipse.jetty:jetty-webapp:8.0.0.v20110901" } diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/jaxws-2.0-axis2-1.6-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/jaxws-2.0-axis2-1.6-javaagent.gradle index 1448dcf444f6..f11a90db53e7 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/jaxws-2.0-axis2-1.6-javaagent.gradle +++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/jaxws-2.0-axis2-1.6-javaagent.gradle @@ -23,9 +23,9 @@ dependencies { implementation project(':instrumentation:jaxws:jaxws-2.0-axis2-1.6:library') def axis2Version = '1.6.0' - library group: 'org.apache.axis2', name: 'axis2-jaxws', version: axis2Version - testLibrary group: 'org.apache.axis2', name: 'axis2-transport-http', version: axis2Version - testLibrary group: 'org.apache.axis2', name: 'axis2-transport-local', version: axis2Version + library "org.apache.axis2:axis2-jaxws:${axis2Version}" + testLibrary "org.apache.axis2:axis2-transport-http:${axis2Version}" + testLibrary "org.apache.axis2:axis2-transport-local:${axis2Version}" testImplementation project(":instrumentation:jaxws:jaxws-2.0-testing") @@ -35,10 +35,10 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:jetty:jetty-8.0:javaagent') - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.11' - testImplementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.2.11' - testImplementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.2.11' + testImplementation "javax.xml.bind:jaxb-api:2.2.11" + testImplementation "com.sun.xml.bind:jaxb-core:2.2.11" + testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11" - testImplementation group: 'com.sun.xml.ws', name: 'jaxws-rt', version: '2.2.8' - testImplementation group: 'com.sun.xml.ws', name: 'jaxws-tools', version: '2.2.8' + testImplementation "com.sun.xml.ws:jaxws-rt:2.2.8" + testImplementation "com.sun.xml.ws:jaxws-tools:2.2.8" } \ No newline at end of file diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle index a8753152179d..6f94ae511fe6 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle +++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - compileOnly group: 'org.apache.axis2', name: 'axis2-jaxws', version: '1.6.0' + compileOnly "org.apache.axis2:axis2-jaxws:1.6.0" } diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/jaxws-2.0-cxf-3.0-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/jaxws-2.0-cxf-3.0-javaagent.gradle index b0e5a27a5a5f..9adae1b6b8f4 100644 --- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/jaxws-2.0-cxf-3.0-javaagent.gradle +++ b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/jaxws-2.0-cxf-3.0-javaagent.gradle @@ -13,8 +13,8 @@ muzzle { dependencies { implementation project(':instrumentation:jaxws:jaxws-2.0-cxf-3.0:library') - library group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxws', version: '3.0.0' - testLibrary group: 'org.apache.cxf', name: 'cxf-rt-transports-http', version: '3.0.0' + library "org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0" + testLibrary "org.apache.cxf:cxf-rt-transports-http:3.0.0" testImplementation project(":instrumentation:jaxws:jaxws-2.0-testing") @@ -24,11 +24,11 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:jetty:jetty-8.0:javaagent') - testImplementation group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.11' - testImplementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.2.11' - testImplementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.2.11' - testImplementation group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' - testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2' - testImplementation group: 'com.sun.xml.messaging.saaj', name: 'saaj-impl', version: '1.5.2' + testImplementation "javax.xml.ws:jaxws-api:2.3.1" + testImplementation "javax.xml.bind:jaxb-api:2.2.11" + testImplementation "com.sun.xml.bind:jaxb-core:2.2.11" + testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11" + testImplementation "javax.activation:javax.activation-api:1.2.0" + testImplementation "javax.annotation:javax.annotation-api:1.2" + testImplementation "com.sun.xml.messaging.saaj:saaj-impl:1.5.2" } \ No newline at end of file diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle index b50ee93c3310..df4d64a97cb9 100644 --- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle +++ b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle @@ -1,6 +1,6 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - compileOnly group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxws', version: '3.0.0' + compileOnly "javax.servlet:javax.servlet-api:3.0.1" + compileOnly "org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0" } diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle index 1ca5c36379b7..7ac73788eb7f 100644 --- a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle +++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle @@ -13,9 +13,9 @@ muzzle { } dependencies { - library group: 'com.sun.xml.ws', name: 'jaxws-rt', version: '2.2.0.1' + library "com.sun.xml.ws:jaxws-rt:2.2.0.1" - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' + compileOnly "javax.servlet:javax.servlet-api:3.0.1" testImplementation project(":instrumentation:jaxws:jaxws-2.0-testing") @@ -28,5 +28,5 @@ dependencies { // TODO (trask) revisit in a few months hopefully once 2.3.5 is published // and this can go back version '2.+' // version 2.3.4 depends on org.glassfish.gmbal:gmbal-api-only:4.0.3 which does not exist - latestDepTestLibrary group: 'com.sun.xml.ws', name: 'jaxws-rt', version: '2.3.3' + latestDepTestLibrary "com.sun.xml.ws:jaxws-rt:2.3.3" } diff --git a/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle b/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle index 66ec5e635fb9..06e41bd246fe 100644 --- a/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle +++ b/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle @@ -10,12 +10,12 @@ checkstyle { } dependencies { - api group: 'javax.xml.ws', name: 'jaxws-api', version: '2.0' - api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' + api "javax.xml.ws:jaxws-api:2.0" + api "javax.jws:javax.jws-api:1.1" api deps.testLogging - api group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '9.4.35.v20201120' - api group: 'org.springframework.ws', name: 'spring-ws-core', version: '3.0.0.RELEASE' + 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')) } \ No newline at end of file diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle index 557e1b6c41ed..420e5973e546 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle @@ -9,6 +9,6 @@ muzzle { } dependencies { - library group: 'javax.xml.ws', name: 'jaxws-api', version: '2.0' + library "javax.xml.ws:jaxws-api:2.0" implementation project(":instrumentation:jaxws:jaxws-common:library") } \ No newline at end of file diff --git a/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle b/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle index 84ffdc44d65c..5ceae8616227 100644 --- a/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle +++ b/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle @@ -9,6 +9,6 @@ muzzle { } dependencies { - library group: 'javax.jws', name: 'javax.jws-api', version: '1.1' + library "javax.jws:javax.jws-api:1.1" implementation project(":instrumentation:jaxws:jaxws-common:library") } \ No newline at end of file diff --git a/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle b/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle index d1a5e59a26ff..f505a6827931 100644 --- a/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle +++ b/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle @@ -12,18 +12,18 @@ dependencies { annotationProcessor deps.autoValue // jdbc unit testing - testLibrary group: 'com.h2database', name: 'h2', version: '1.3.169' + testLibrary "com.h2database:h2:1.3.169" // first version jdk 1.6 compatible - testLibrary group: 'org.apache.derby', name: 'derby', version: '10.6.1.0' - testLibrary group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0' + testLibrary "org.apache.derby:derby:10.6.1.0" + testLibrary "org.hsqldb:hsqldb:2.0.0" - testLibrary group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '7.0.19' + testLibrary "org.apache.tomcat:tomcat-jdbc:7.0.19" // tomcat needs this to run - testLibrary group: 'org.apache.tomcat', name: 'tomcat-juli', version: '7.0.19' - testLibrary group: 'com.zaxxer', name: 'HikariCP', version: '2.4.0' - testLibrary group: 'com.mchange', name: 'c3p0', version: '0.9.5' + testLibrary "org.apache.tomcat:tomcat-juli:7.0.19" + testLibrary "com.zaxxer:HikariCP:2.4.0" + testLibrary "com.mchange:c3p0:0.9.5" - latestDepTestLibrary group: 'org.apache.derby', name: 'derby', version: '10.14.+' + latestDepTestLibrary "org.apache.derby:derby:10.14.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle b/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle index be5f3f8245c4..2e55cbc701f1 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle +++ b/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle @@ -10,10 +10,10 @@ muzzle { } dependencies { - library group: 'redis.clients', name: 'jedis', version: '1.4.0' + library "redis.clients:jedis:1.4.0" - testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' + testImplementation "com.github.kstyrc:embedded-redis:0.6" // Jedis 3.0 has API changes that prevent instrumentation from applying - latestDepTestLibrary group: 'redis.clients', name: 'jedis', version: '2.+' + latestDepTestLibrary "redis.clients:jedis:2.+" } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle b/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle index 104e5460356b..de135dd29e7e 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle +++ b/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle @@ -15,12 +15,12 @@ muzzle { } dependencies { - library group: 'redis.clients', name: 'jedis', version: '3.0.0' + library "redis.clients:jedis:3.0.0" - testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' + testImplementation "com.github.kstyrc:embedded-redis:0.6" // ensures jedis-1.4 instrumentation does not load with jedis 3.0+ by failing // the tests in the event it does. The tests will end up with double spans testInstrumentation project(':instrumentation:jedis:jedis-1.4:javaagent') - testLibrary group: 'redis.clients', name: 'jedis', version: '3.+' + testLibrary "redis.clients:jedis:3.+" } diff --git a/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle b/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle index b6947b95d567..7e6e49de9082 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle +++ b/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle @@ -13,7 +13,7 @@ muzzle { } dependencies { - library group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.0' + library "org.eclipse.jetty:jetty-server:11.0.0" implementation project(':instrumentation:servlet:servlet-5.0:javaagent') implementation project(':instrumentation:jetty:jetty-common:javaagent') @@ -22,5 +22,5 @@ dependencies { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '11.0.0' + testLibrary "org.eclipse.jetty:jetty-servlet:11.0.0" } diff --git a/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle b/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle index ccd5c8dfa574..7ed4d5ecbaed 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle +++ b/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle @@ -11,7 +11,7 @@ muzzle { } dependencies { - library group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901' + library "org.eclipse.jetty:jetty-server:8.0.0.v20110901" implementation project(':instrumentation:servlet:servlet-3.0:javaagent') implementation project(':instrumentation:jetty:jetty-common:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') @@ -21,12 +21,12 @@ dependencies { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901' - testLibrary group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '8.0.0.v20110901' + testLibrary "org.eclipse.jetty:jetty-servlet:8.0.0.v20110901" + testLibrary "org.eclipse.jetty:jetty-continuation:8.0.0.v20110901" // Jetty 10 seems to refuse to run on java8. // TODO: we need to setup separate test for Jetty 10 when that is released. - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+' - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+' - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+' + latestDepTestLibrary "org.eclipse.jetty:jetty-server:9.+" + latestDepTestLibrary "org.eclipse.jetty:jetty-servlet:9.+" + latestDepTestLibrary "org.eclipse.jetty:jetty-continuation:9.+" } diff --git a/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle b/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle index e66a841cd6f2..0877ce2576f1 100644 --- a/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle +++ b/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { - testImplementation group: 'javax.jms', name: 'jms-api', version: '1.1-rev-1' + testImplementation "javax.jms:jms-api:1.1-rev-1" testImplementation project(':instrumentation:jms-1.1:javaagent') testImplementation project(':instrumentation-api') diff --git a/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle b/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle index f627bcdcb815..23b5fc2a293b 100644 --- a/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle +++ b/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle @@ -33,14 +33,14 @@ repositories { } dependencies { - compileOnly group: 'javax.jms', name: 'jms-api', version: '1.1-rev-1' + compileOnly "javax.jms:jms-api:1.1-rev-1" - testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' + testImplementation "javax.annotation:javax.annotation-api:1.3.2" testImplementation("org.springframework.boot:spring-boot-starter-activemq:${versions.springboot}") - testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springboot) { + testImplementation("org.springframework.boot:spring-boot-starter-test:${versions.springboot}") { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - jms2TestImplementation group: 'org.hornetq', name: 'hornetq-jms-client', version: '2.4.7.Final' - jms2TestImplementation group: 'org.hornetq', name: 'hornetq-jms-server', version: '2.4.7.Final' + jms2TestImplementation "org.hornetq:hornetq-jms-client:2.4.7.Final" + jms2TestImplementation "org.hornetq:hornetq-jms-server:2.4.7.Final" } diff --git a/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle b/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle index 50f55fba773e..777693627564 100644 --- a/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle +++ b/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle @@ -1,6 +1,6 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - compileOnly group: 'jakarta.faces', name: 'jakarta.faces-api', version: '2.3.2' - compileOnly group: 'jakarta.el', name: 'jakarta.el-api', version: '3.0.3' + compileOnly "jakarta.faces:jakarta.faces-api:2.3.2" + compileOnly "jakarta.el:jakarta.el-api:3.0.3" } diff --git a/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle b/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle index 9dd66bdb5d6d..d7f320fd198b 100644 --- a/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle +++ b/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle @@ -3,17 +3,17 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api deps.testLogging - compileOnly group: 'jakarta.faces', name: 'jakarta.faces-api', version: '2.3.2' - compileOnly group: 'jakarta.el', name: 'jakarta.el-api', version: '3.0.3' + compileOnly "jakarta.faces:jakarta.faces-api:2.3.2" + compileOnly "jakarta.el:jakarta.el-api:3.0.3" implementation(project(':testing-common')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - implementation group: 'org.jsoup', name: 'jsoup', version: '1.13.1' + implementation "org.jsoup:jsoup:1.13.1" def jettyVersion = '9.4.35.v20201120' - api group: 'org.eclipse.jetty', name: 'jetty-annotations', version: jettyVersion - implementation group: 'org.eclipse.jetty', name: 'apache-jsp', version: jettyVersion - implementation group: 'org.glassfish', name: 'jakarta.el', version: '3.0.2' - implementation group: 'jakarta.websocket', name: 'jakarta.websocket-api', version: '1.1.1' + api "org.eclipse.jetty:jetty-annotations:${jettyVersion}" + implementation "org.eclipse.jetty:apache-jsp:${jettyVersion}" + implementation "org.glassfish:jakarta.el:3.0.2" + implementation "jakarta.websocket:jakarta.websocket-api:1.1.1" } diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle b/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle index d649f670b4b6..b04cc82b993b 100644 --- a/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle +++ b/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle @@ -55,7 +55,7 @@ testSets { test.dependsOn mojarra12Test, mojarra2Test dependencies { - compileOnly group: 'javax.faces', name: 'jsf-api', version: '1.2' + compileOnly "javax.faces:jsf-api:1.2" implementation project(':instrumentation:jsf:jsf-common:library') @@ -63,11 +63,11 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') - mojarra12TestImplementation group: 'javax.faces', name: 'jsf-impl', version: '1.2-20' - mojarra12TestImplementation group: 'javax.faces', name: 'jsf-api', version: '1.2' - mojarra12TestImplementation group: 'com.sun.facelets', name: 'jsf-facelets', version: '1.1.14' + mojarra12TestImplementation "javax.faces:jsf-impl:1.2-20" + mojarra12TestImplementation "javax.faces:jsf-api:1.2" + mojarra12TestImplementation "com.sun.facelets:jsf-facelets:1.1.14" - mojarra2TestImplementation group: 'org.glassfish', name: 'jakarta.faces', version: '2.3.12' + mojarra2TestImplementation "org.glassfish:jakarta.faces:2.3.12" - latestDepTestImplementation group: 'org.glassfish', name: 'jakarta.faces', version: '2.+' + latestDepTestImplementation "org.glassfish:jakarta.faces:2.+" } diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle b/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle index 1eb274b96052..da21b5553c54 100644 --- a/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle +++ b/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle @@ -23,8 +23,8 @@ testSets { test.dependsOn myfaces12Test, myfaces2Test dependencies { - compileOnly group: 'org.apache.myfaces.core', name: 'myfaces-api', version: '1.2.12' - compileOnly group: 'javax.el', name: 'el-api', version: '1.0' + compileOnly "org.apache.myfaces.core:myfaces-api:1.2.12" + compileOnly "javax.el:el-api:1.0" implementation project(':instrumentation:jsf:jsf-common:library') @@ -32,12 +32,12 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') - myfaces12TestImplementation group: 'org.apache.myfaces.core', name: 'myfaces-impl', version: '1.2.12' - myfaces12TestImplementation group: 'com.sun.facelets', name: 'jsf-facelets', version: '1.1.14' + myfaces12TestImplementation "org.apache.myfaces.core:myfaces-impl:1.2.12" + myfaces12TestImplementation "com.sun.facelets:jsf-facelets:1.1.14" - myfaces2TestImplementation group: 'org.apache.myfaces.core', name: 'myfaces-impl', version: '2.3.2' - myfaces2TestImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.11' - myfaces2TestImplementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.2.11' + myfaces2TestImplementation "org.apache.myfaces.core:myfaces-impl:2.3.2" + myfaces2TestImplementation "javax.xml.bind:jaxb-api:2.2.11" + myfaces2TestImplementation "com.sun.xml.bind:jaxb-impl:2.2.11" - latestDepTestImplementation group: 'org.apache.myfaces.core', name: 'myfaces-impl', version: '2.+' + latestDepTestImplementation "org.apache.myfaces.core:myfaces-impl:2.+" } diff --git a/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle b/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle index cdf6b3bb2205..00fe7022264d 100644 --- a/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle +++ b/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle @@ -14,24 +14,24 @@ muzzle { dependencies { // compiling against tomcat 7.0.20 because there seems to be some issues with Tomcat's dependency < 7.0.20 - compileOnly group: 'org.apache.tomcat', name: 'tomcat-jasper', version: '7.0.20' - compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' + compileOnly "org.apache.tomcat:tomcat-jasper:7.0.20" + compileOnly "javax.servlet.jsp:javax.servlet.jsp-api:2.3.0" + compileOnly "javax.servlet:javax.servlet-api:3.1.0" testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37 // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37' - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.37' - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.37' + testLibrary "org.apache.tomcat.embed:tomcat-embed-core:7.0.37" + testLibrary "org.apache.tomcat.embed:tomcat-embed-logging-juli:7.0.37" + testLibrary "org.apache.tomcat.embed:tomcat-embed-jasper:7.0.37" - latestDepTestLibrary group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '+' - latestDepTestLibrary group: 'javax.servlet', name: 'javax.servlet-api', version: '+' - latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.+' - latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.+' - latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '9.+' + latestDepTestLibrary "javax.servlet.jsp:javax.servlet.jsp-api:+" + latestDepTestLibrary "javax.servlet:javax.servlet-api:+" + latestDepTestLibrary "org.apache.tomcat.embed:tomcat-embed-core:9.+" + latestDepTestLibrary "org.apache.tomcat.embed:tomcat-embed-jasper:9.+" + latestDepTestLibrary "org.apache.tomcat.embed:tomcat-embed-logging-juli:9.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle b/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle index c0f04657f1b5..5fa47c2cb035 100644 --- a/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle +++ b/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle @@ -10,23 +10,23 @@ muzzle { } dependencies { - library group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0' + library "org.apache.kafka:kafka-clients:0.11.0.0" - testLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE' - testLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - testLibrary group: 'org.assertj', name: 'assertj-core', version: '2.9.+' + testLibrary "org.springframework.kafka:spring-kafka:1.3.3.RELEASE" + testLibrary "org.springframework.kafka:spring-kafka-test:1.3.3.RELEASE" + testImplementation "javax.xml.bind:jaxb-api:2.2.3" + testLibrary "org.assertj:assertj-core:2.9.+" testImplementation deps.mockito // Include latest version of kafka itself along with latest version of client libs. // This seems to help with jar compatibility hell. - latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+' + latestDepTestLibrary "org.apache.kafka:kafka_2.11:2.3.+" // (Pinning to 2.3.x: 2.4.0 introduces an error when executing compileLatestDepTestGroovy) // Caused by: java.lang.NoClassDefFoundError: org.I0Itec.zkclient.ZkClient - latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+' - latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+' - latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+' - latestDepTestLibrary group: 'org.assertj', name: 'assertj-core', version: '3.+' + latestDepTestLibrary "org.apache.kafka:kafka-clients:2.3.+" + latestDepTestLibrary "org.springframework.kafka:spring-kafka:2.2.+" + latestDepTestLibrary "org.springframework.kafka:spring-kafka-test:2.2.+" + latestDepTestLibrary "org.assertj:assertj-core:3.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle b/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle index 18ec1752733b..30272192c10c 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle +++ b/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle @@ -9,29 +9,29 @@ muzzle { } dependencies { - library group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0' + library "org.apache.kafka:kafka-streams:0.11.0.0" // Include kafka-clients instrumentation for tests. testInstrumentation project(':instrumentation:kafka-clients-0.11:javaagent') - testLibrary group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0' - testLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE' - testLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - testLibrary group: 'org.assertj', name: 'assertj-core', version: '2.9.+' + testLibrary "org.apache.kafka:kafka-clients:0.11.0.0" + testLibrary "org.springframework.kafka:spring-kafka:1.3.3.RELEASE" + testLibrary "org.springframework.kafka:spring-kafka-test:1.3.3.RELEASE" + testImplementation "javax.xml.bind:jaxb-api:2.2.3" + testLibrary "org.assertj:assertj-core:2.9.+" testImplementation deps.mockito // Include latest version of kafka itself along with latest version of client libs. // This seems to help with jar compatibility hell. - latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+' + latestDepTestLibrary "org.apache.kafka:kafka_2.11:2.3.+" // (Pinning to 2.3.x: 2.4.0 introduces an error when executing compileLatestDepTestGroovy) // Caused by: java.lang.NoClassDefFoundError: org.I0Itec.zkclient.ZkClient - latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+' - latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka-streams', version: '2.3.+' - latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+' - latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+' - latestDepTestLibrary group: 'org.assertj', name: 'assertj-core', version: '3.+' + latestDepTestLibrary "org.apache.kafka:kafka-clients:2.3.+" + latestDepTestLibrary "org.apache.kafka:kafka-streams:2.3.+" + latestDepTestLibrary "org.springframework.kafka:spring-kafka:2.2.+" + latestDepTestLibrary "org.springframework.kafka:spring-kafka-test:2.2.+" + latestDepTestLibrary "org.assertj:assertj-core:3.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle b/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle index c7c71ec76cdc..731e35ff4131 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle +++ b/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle @@ -2,5 +2,5 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { testImplementation project(':instrumentation:kubernetes-client-7.0:javaagent') - testImplementation group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0' + testImplementation "io.kubernetes:client-java-api:7.0.0" } diff --git a/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle b/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle index 2e90b41d4ec1..d2e80c32f655 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle +++ b/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0') + library("io.kubernetes:client-java-api:7.0.0") implementation(project(':instrumentation:okhttp:okhttp-3.0:javaagent')) diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle b/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle index 02b5f3e636c6..4f3dc6e1d882 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle @@ -11,11 +11,11 @@ muzzle { dependencies { - library group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final' + library "biz.paluch.redis:lettuce:4.0.Final" - testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' + testImplementation "com.github.kstyrc:embedded-redis:0.6" - latestDepTestLibrary group: 'biz.paluch.redis', name: 'lettuce', version: '4.+' + latestDepTestLibrary "biz.paluch.redis:lettuce:4.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle b/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle index 19694002b26a..7943b6ab7fa7 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle @@ -10,12 +10,12 @@ muzzle { } dependencies { - compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE' + compileOnly "io.lettuce:lettuce-core:5.0.0.RELEASE" implementation project(':instrumentation:lettuce:lettuce-common:library') - testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' - testImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE' + testImplementation "com.github.kstyrc:embedded-redis:0.6" + testImplementation "io.lettuce:lettuce-core:5.0.0.RELEASE" testInstrumentation project(':instrumentation:reactor-3.1:javaagent') } diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle b/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle index 2af1d9183621..87e45b2fec2a 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle @@ -10,15 +10,15 @@ muzzle { } dependencies { - library group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE' + library "io.lettuce:lettuce-core:5.1.0.RELEASE" implementation project(':instrumentation:lettuce:lettuce-5.1:library') testImplementation project(':instrumentation:lettuce:lettuce-5.1:testing') - testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' + testImplementation "com.github.kstyrc:embedded-redis:0.6" // Only 5.2+ will have command arguments in the db.statement tag. - testLibrary group: 'io.lettuce', name: 'lettuce-core', version: '5.2.0.RELEASE' + testLibrary "io.lettuce:lettuce-core:5.2.0.RELEASE" testInstrumentation project(':instrumentation:reactor-3.1:javaagent') } diff --git a/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle b/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle index 154770f682c8..411d138d1129 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle +++ b/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" apply plugin: "net.ltgt.errorprone" dependencies { - library group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE' + library "io.lettuce:lettuce-core:5.1.0.RELEASE" implementation project(':instrumentation:lettuce:lettuce-common:library') diff --git a/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle b/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle index f8477467b67b..8845a70c003f 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle +++ b/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle @@ -3,9 +3,9 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE' + api "io.lettuce:lettuce-core:5.1.0.RELEASE" - api group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' + api "com.github.kstyrc:embedded-redis:0.6" implementation deps.guava diff --git a/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle b/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle index f882863be35b..dee3addc0bb3 100644 --- a/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle +++ b/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle @@ -4,7 +4,7 @@ apply from: "$rootDir/gradle/instrumentation.gradle" // liberty module has access to servlet api while liberty-dispatcher does not dependencies { - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' + compileOnly "javax.servlet:javax.servlet-api:3.0.1" implementation project(':instrumentation:servlet:servlet-3.0:javaagent') } diff --git a/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle b/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle index 0e2055851d90..01a286ee819a 100644 --- a/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle +++ b/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle @@ -12,7 +12,7 @@ muzzle { dependencies { // 1.2 introduces MDC and there's no version earlier than 1.2.4 available - library group: 'log4j', name: 'log4j', version: '1.2.4' + library "log4j:log4j:1.2.4" } configurations { diff --git a/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle b/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle index cb1c03ca2dd8..128481ef7ec1 100644 --- a/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle +++ b/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.7' + api "org.apache.logging.log4j:log4j-core:2.7" implementation deps.guava @@ -11,5 +11,5 @@ dependencies { implementation deps.opentelemetryApi implementation deps.spock - annotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.7' + annotationProcessor "org.apache.logging.log4j:log4j-core:2.7" } diff --git a/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle b/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle index f65ffc26d168..19f2a2101c06 100644 --- a/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle +++ b/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle @@ -19,7 +19,7 @@ testSets { } dependencies { - library group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.2' + library "org.apache.logging.log4j:log4j-core:2.13.2" implementation project(':instrumentation:log4j:log4j-2.13.2:library') diff --git a/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle b/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle index b4bb217fbaa3..59d98717aeb0 100644 --- a/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle +++ b/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.2' + library "org.apache.logging.log4j:log4j-core:2.13.2" testImplementation project(':instrumentation:log4j:log4j-2-testing') } diff --git a/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle b/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle index 71319b391992..35c77a483ddf 100644 --- a/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle +++ b/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle @@ -10,9 +10,9 @@ muzzle { } dependencies { - library group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.7' + library "org.apache.logging.log4j:log4j-core:2.7" testImplementation project(':instrumentation:log4j:log4j-2-testing') - latestDepTestLibrary group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.1' + latestDepTestLibrary "org.apache.logging.log4j:log4j-core:2.13.1" } diff --git a/instrumentation/logback/logback-1.0/javaagent/logback-1.0-javaagent.gradle b/instrumentation/logback/logback-1.0/javaagent/logback-1.0-javaagent.gradle index fae82d934d21..0eef77bc78f5 100644 --- a/instrumentation/logback/logback-1.0/javaagent/logback-1.0-javaagent.gradle +++ b/instrumentation/logback/logback-1.0/javaagent/logback-1.0-javaagent.gradle @@ -11,10 +11,10 @@ muzzle { dependencies { implementation project(':instrumentation:logback:logback-1.0:library') - library group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.0' + library "ch.qos.logback:logback-classic:1.0.0" testImplementation project(':instrumentation:logback:logback-1.0:testing') // 1.3+ contains breaking changes, check back after it stabilizes. - latestDepTestLibrary group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.+' + latestDepTestLibrary "ch.qos.logback:logback-classic:1.2.+" } diff --git a/instrumentation/logback/logback-1.0/library/logback-1.0-library.gradle b/instrumentation/logback/logback-1.0/library/logback-1.0-library.gradle index 709a6c427a18..47d56527a8aa 100644 --- a/instrumentation/logback/logback-1.0/library/logback-1.0-library.gradle +++ b/instrumentation/logback/logback-1.0/library/logback-1.0-library.gradle @@ -1,10 +1,10 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.0' + library "ch.qos.logback:logback-classic:1.0.0" testImplementation project(':instrumentation:logback:logback-1.0:testing') // 1.3+ contains breaking changes, check back after it stabilizes. - latestDepTestLibrary group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.+' + latestDepTestLibrary "ch.qos.logback:logback-classic:1.2.+" } diff --git a/instrumentation/logback/logback-1.0/testing/logback-1.0-testing.gradle b/instrumentation/logback/logback-1.0/testing/logback-1.0-testing.gradle index 39badc142542..838078e9491a 100644 --- a/instrumentation/logback/logback-1.0/testing/logback-1.0-testing.gradle +++ b/instrumentation/logback/logback-1.0/testing/logback-1.0-testing.gradle @@ -21,7 +21,7 @@ dependencies { api project(':testing-common') - api group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.0' + api "ch.qos.logback:logback-classic:1.0.0" implementation deps.guava diff --git a/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle b/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle index fb69c271b983..dde787b8952a 100644 --- a/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle +++ b/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle @@ -12,7 +12,7 @@ muzzle { dependencies { implementation(project(':instrumentation:mongo:mongo-3.1:library')) - library group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' + library "org.mongodb:mongo-java-driver:3.1.0" testImplementation project(':instrumentation:mongo:mongo-3.1:testing') } diff --git a/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle b/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle index c37d058a38ff..1cf203ba9e41 100644 --- a/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle +++ b/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" apply plugin: "net.ltgt.errorprone" dependencies { - library group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' + library "org.mongodb:mongo-java-driver:3.1.0" testImplementation project(':instrumentation:mongo:mongo-3.1:testing') } \ No newline at end of file diff --git a/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle b/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle index 5b1ad514cde1..a2f910f2286f 100644 --- a/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle +++ b/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':instrumentation:mongo:mongo-testing') - compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' + compileOnly "org.mongodb:mongo-java-driver:3.1.0" implementation deps.groovy implementation deps.opentelemetryApi diff --git a/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle b/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle index ba81dad002c3..7ccd0b1ea6d2 100644 --- a/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle +++ b/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle @@ -22,7 +22,7 @@ dependencies { implementation(project(':instrumentation:mongo:mongo-3.1:library')) // a couple of test attribute verifications don't pass until 3.8.0 - library group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0' + library "org.mongodb:mongo-java-driver:3.8.0" testImplementation project(':instrumentation:mongo:mongo-testing') } diff --git a/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle b/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle index 7b8cf54bb77a..762cd5f30d81 100644 --- a/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle +++ b/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle @@ -12,11 +12,11 @@ muzzle { dependencies { implementation(project(':instrumentation:mongo:mongo-3.1:library')) - library group: 'org.mongodb', name: 'mongodb-driver-core', version: '4.0.0' + library "org.mongodb:mongodb-driver-core:4.0.0" - testLibrary group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.0.0' - testLibrary group: 'org.mongodb', name: 'mongodb-driver-reactivestreams', version: '4.0.0' + testLibrary "org.mongodb:mongodb-driver-sync:4.0.0" + testLibrary "org.mongodb:mongodb-driver-reactivestreams:4.0.0" testImplementation project(':instrumentation:mongo:mongo-testing') - testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5' + testImplementation "de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5" } diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle b/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle index ff53279a7156..3c34c040b7f1 100644 --- a/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle +++ b/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle @@ -13,7 +13,7 @@ muzzle { dependencies { implementation(project(':instrumentation:mongo:mongo-3.1:library')) - library group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0' + library "org.mongodb:mongodb-driver-async:3.3.0" testImplementation project(':instrumentation:mongo:mongo-testing') diff --git a/instrumentation/mongo/mongo-testing/mongo-testing.gradle b/instrumentation/mongo/mongo-testing/mongo-testing.gradle index f7f3ad70ce45..3f18ff389d42 100644 --- a/instrumentation/mongo/mongo-testing/mongo-testing.gradle +++ b/instrumentation/mongo/mongo-testing/mongo-testing.gradle @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'org.testcontainers', name: 'mongodb', version: versions.testcontainers + api "org.testcontainers:mongodb:${versions.testcontainers}" implementation deps.groovy implementation deps.opentelemetryApi diff --git a/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle b/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle index 83210be660af..4177fcd6e4a6 100644 --- a/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle +++ b/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle @@ -20,13 +20,13 @@ testSets { } dependencies { - compileOnly group: 'io.netty', name: 'netty', version: '3.8.0.Final' + compileOnly "io.netty:netty:3.8.0.Final" - testImplementation group: 'io.netty', name: 'netty', version: '3.8.0.Final' - testImplementation group: 'com.ning', name: 'async-http-client', version: '1.8.0' + testImplementation "io.netty:netty:3.8.0.Final" + testImplementation "com.ning:async-http-client:1.8.0" - latestDepTestImplementation group: 'io.netty', name: 'netty', version: '3.10.+' - latestDepTestImplementation group: 'com.ning', name: 'async-http-client', version: '1.9.+' + latestDepTestImplementation "io.netty:netty:3.10.+" + latestDepTestImplementation "com.ning:async-http-client:1.9.+" } // We need to force the dependency to the earliest supported version because other libraries declare newer versions. diff --git a/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle b/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle index 51deb43d5ec8..5648e23d9c3c 100644 --- a/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle +++ b/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle @@ -27,8 +27,8 @@ muzzle { } dependencies { - library group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final' - latestDepTestLibrary group: 'io.netty', name: 'netty-codec-http', version: '4.0.56.Final' + library "io.netty:netty-codec-http:4.0.0.Final" + latestDepTestLibrary "io.netty:netty-codec-http:4.0.56.Final" } // We need to force the dependency to the earliest supported version because other libraries declare newer versions. diff --git a/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle b/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle index f19ea938c866..00cee744640f 100644 --- a/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle +++ b/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle @@ -27,14 +27,14 @@ muzzle { } dependencies { - library group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final' + library "io.netty:netty-codec-http:4.1.0.Final" api project(':instrumentation:netty:netty-4.1:library') //Contains logging handler - testLibrary group: 'io.netty', name: 'netty-handler', version: '4.1.0.Final' + testLibrary "io.netty:netty-handler:4.1.0.Final" - latestDepTestLibrary group: 'io.netty', name: 'netty-codec-http', version: '(,5.0)' - latestDepTestLibrary group: 'io.netty', name: 'netty-handler', version: '(,5.0)' + latestDepTestLibrary "io.netty:netty-codec-http:(,5.0)" + latestDepTestLibrary "io.netty:netty-handler:(,5.0)" } test { diff --git a/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle b/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle index 626b45487241..f4256c97f897 100644 --- a/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle +++ b/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final' + compileOnly "io.netty:netty-codec-http:4.1.0.Final" } \ No newline at end of file diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle b/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle index 5d7e35476462..621cee0fbb58 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle @@ -14,7 +14,7 @@ muzzle { } dependencies { - library(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0') + library("com.squareup.okhttp:okhttp:2.2.0") - latestDepTestLibrary group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)' + latestDepTestLibrary "com.squareup.okhttp:okhttp:[2.6,3)" } diff --git a/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle b/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle index 560b020fdcb0..d95f7039f1ac 100644 --- a/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle +++ b/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle @@ -21,7 +21,7 @@ not transitive. dependencies { implementation project(':instrumentation:okhttp:okhttp-3.0:library') - library(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0') + library("com.squareup.okhttp3:okhttp:3.0.0") testImplementation project(':instrumentation:okhttp:okhttp-3.0:testing') } diff --git a/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle b/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle index 41c80047c621..053ca0d422c5 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle +++ b/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" apply plugin: "net.ltgt.errorprone" dependencies { - library group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0' + library "com.squareup.okhttp3:okhttp:3.0.0" testImplementation project(':instrumentation:okhttp:okhttp-3.0:testing') } diff --git a/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle b/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle index 720633405017..5574a9a6e7f5 100644 --- a/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle +++ b/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle @@ -5,7 +5,7 @@ dependencies { exclude module: 'okhttp' } - api group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0' + api "com.squareup.okhttp3:okhttp:3.0.0" implementation deps.guava diff --git a/instrumentation/oshi/javaagent/oshi-javaagent.gradle b/instrumentation/oshi/javaagent/oshi-javaagent.gradle index 0c97693c691d..f7931109e3cb 100644 --- a/instrumentation/oshi/javaagent/oshi-javaagent.gradle +++ b/instrumentation/oshi/javaagent/oshi-javaagent.gradle @@ -11,7 +11,7 @@ muzzle { dependencies { implementation project(':instrumentation:oshi:library') - library group: 'com.github.oshi', name: 'oshi-core', version: '5.3.1' + library "com.github.oshi:oshi-core:5.3.1" testImplementation deps.guava } diff --git a/instrumentation/oshi/library/oshi-library.gradle b/instrumentation/oshi/library/oshi-library.gradle index f654b5b683fc..a81df89d41fd 100644 --- a/instrumentation/oshi/library/oshi-library.gradle +++ b/instrumentation/oshi/library/oshi-library.gradle @@ -4,7 +4,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { implementation deps.opentelemetryApiMetrics - library group: 'com.github.oshi', name: 'oshi-core', version: '5.3.1' + library "com.github.oshi:oshi-core:5.3.1" testImplementation deps.opentelemetrySdkMetrics testImplementation project(':testing-common') diff --git a/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle b/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle index b24fef413c20..a0d2f00adb89 100644 --- a/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle +++ b/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle @@ -30,7 +30,7 @@ muzzle { dependencies { // TODO(anuraaga): Something about library configuration doesn't work well with scala compilation // here. - compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0' + compileOnly "com.typesafe.play:play_2.11:2.4.0" testInstrumentation project(':instrumentation:netty:netty-4.0:javaagent') testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') @@ -38,15 +38,15 @@ dependencies { testInstrumentation project(':instrumentation:async-http-client:async-http-client-2.0:javaagent') // Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5 - testLibrary group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0' - testLibrary group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0' - testLibrary(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') { + testLibrary "com.typesafe.play:play-java_2.11:2.5.0" + testLibrary "com.typesafe.play:play-java-ws_2.11:2.5.0" + testLibrary("com.typesafe.play:play-test_2.11:2.5.0") { exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' } - latestDepTestLibrary group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+' - latestDepTestLibrary group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+' - latestDepTestLibrary(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') { + latestDepTestLibrary "com.typesafe.play:play-java_2.11:2.5.+" + latestDepTestLibrary "com.typesafe.play:play-java-ws_2.11:2.5.+" + latestDepTestLibrary("com.typesafe.play:play-test_2.11:2.5.+") { exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle b/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle index c35ef6002acd..541e6fd2faee 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle +++ b/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle @@ -10,16 +10,16 @@ muzzle { } dependencies { - library group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0' + library "com.rabbitmq:amqp-client:2.7.0" - testLibrary group: 'org.springframework.amqp', name: 'spring-rabbit', version: '1.1.0.RELEASE' + testLibrary "org.springframework.amqp:spring-rabbit:1.1.0.RELEASE" testImplementation deps.testcontainers } configurations.testRuntimeClasspath { resolutionStrategy { - force group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0' + force "com.rabbitmq:amqp-client:2.7.0" } } diff --git a/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle b/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle index 9e185805ec3b..5e5514149b50 100644 --- a/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle +++ b/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle @@ -9,14 +9,14 @@ muzzle { } dependencies { - library group: 'io.ratpack', name: 'ratpack-core', version: '1.4.0' + library "io.ratpack:ratpack-core:1.4.0" implementation project(':instrumentation:netty:netty-4.1:javaagent') - testLibrary group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.4.0' + testLibrary "io.ratpack:ratpack-groovy-test:1.4.0" if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { - testImplementation group: 'com.sun.activation', name: 'jakarta.activation', version: '1.2.2' + testImplementation "com.sun.activation:jakarta.activation:1.2.2" } } diff --git a/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle b/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle index e19cdd440e7f..dbc36db27a3c 100644 --- a/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle +++ b/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle @@ -12,14 +12,14 @@ muzzle { dependencies { implementation project(':instrumentation:reactor-3.1:library') - testLibrary group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE' - testLibrary group: 'io.projectreactor', name: 'reactor-test', version: '3.1.0.RELEASE' + testLibrary "io.projectreactor:reactor-core:3.1.0.RELEASE" + testLibrary "io.projectreactor:reactor-test:3.1.0.RELEASE" testImplementation project(':instrumentation:reactor-3.1:testing') testImplementation deps.opentelemetryExtAnnotations - latestDepTestLibrary group: 'io.projectreactor', name: 'reactor-core', version: '3.+' - latestDepTestLibrary group: 'io.projectreactor', name: 'reactor-test', version: '3.+' + latestDepTestLibrary "io.projectreactor:reactor-core:3.+" + latestDepTestLibrary "io.projectreactor:reactor-test:3.+" // Looks like later versions on reactor need this dependency for some reason even though it is marked as optional. - latestDepTestLibrary group: 'io.micrometer', name: 'micrometer-core', version: '1.+' + latestDepTestLibrary "io.micrometer:micrometer-core:1.+" } diff --git a/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle b/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle index 38e01aa6e23d..bd783a53bacf 100644 --- a/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle +++ b/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle @@ -1,12 +1,12 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE' - testLibrary group: 'io.projectreactor', name: 'reactor-test', version: '3.1.0.RELEASE' + library "io.projectreactor:reactor-core:3.1.0.RELEASE" + testLibrary "io.projectreactor:reactor-test:3.1.0.RELEASE" testImplementation project(':instrumentation:reactor-3.1:testing') - latestDepTestLibrary group: 'io.projectreactor', name: 'reactor-core', version: '3.+' - latestDepTestLibrary group: 'io.projectreactor', name: 'reactor-test', version: '3.+' + latestDepTestLibrary "io.projectreactor:reactor-core:3.+" + latestDepTestLibrary "io.projectreactor:reactor-test:3.+" // Looks like later versions on reactor need this dependency for some reason even though it is marked as optional. - latestDepTestLibrary group: 'io.micrometer', name: 'micrometer-core', version: '1.+' + latestDepTestLibrary "io.micrometer:micrometer-core:1.+" } \ No newline at end of file diff --git a/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle b/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle index fd4ec4d44ace..273891498ee5 100644 --- a/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle +++ b/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE' + api "io.projectreactor:reactor-core:3.1.0.RELEASE" implementation deps.groovy implementation deps.opentelemetryApi diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle index 2004e6261116..dc42c767a084 100644 --- a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle +++ b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle @@ -21,5 +21,5 @@ dependencies { testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') testInstrumentation project(':instrumentation:reactor-3.1:javaagent') - latestDepTestLibrary group: 'io.projectreactor.netty', name: 'reactor-netty', version: '(,1.0.0)' + latestDepTestLibrary "io.projectreactor.netty:reactor-netty:(,1.0.0)" } diff --git a/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle b/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle index fb45e082ebb2..cf2a71410f73 100644 --- a/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle +++ b/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle @@ -45,7 +45,7 @@ muzzle { } dependencies { - library group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0' + library "com.github.etaty:rediscala_2.11:1.8.0" - testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' + testImplementation "com.github.kstyrc:embedded-redis:0.6" } diff --git a/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle b/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle index f4486d40cb42..890d1e14a9b3 100644 --- a/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle +++ b/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle @@ -9,8 +9,8 @@ muzzle { } dependencies { - library group: 'org.redisson', name: 'redisson', version: '3.0.0' - testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' + library "org.redisson:redisson:3.0.0" + testImplementation "com.github.kstyrc:embedded-redis:0.6" } test { diff --git a/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle b/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle index a96c56678094..43fc9259ebda 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle +++ b/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'org.apache.rocketmq', name: 'rocketmq-client', version: '4.8.0' + library "org.apache.rocketmq:rocketmq-client:4.8.0" implementation project(':instrumentation:rocketmq-client-4.8:library') testImplementation project(':instrumentation:rocketmq-client-4.8:testing') diff --git a/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle b/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle index 207a7622fa5d..e67239b90a89 100644 --- a/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle +++ b/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle @@ -1,6 +1,6 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'org.apache.rocketmq', name: 'rocketmq-client', version: '4.8.0' + library "org.apache.rocketmq:rocketmq-client:4.8.0" testImplementation project(':instrumentation:rocketmq-client-4.8:testing') } \ No newline at end of file diff --git a/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle b/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle index ec6d24d3ce2a..e267e5b12587 100644 --- a/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle +++ b/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'org.apache.rocketmq', name: 'rocketmq-test', version: '4.8.0' + api "org.apache.rocketmq:rocketmq-test:4.8.0" implementation deps.guava implementation deps.groovy diff --git a/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle b/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle index b4340c010140..bd3f9a62c876 100644 --- a/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle +++ b/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'io.reactivex', name: 'rxjava', version: '1.0.7' + library "io.reactivex:rxjava:1.0.7" } diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle b/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle index 091b4abdab0d..f79b260aa949 100644 --- a/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle +++ b/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'io.reactivex.rxjava2', name: 'rxjava', version: "2.0.6" + library "io.reactivex.rxjava2:rxjava:2.0.6" implementation project(":instrumentation:rxjava:rxjava-2.0:library") diff --git a/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle b/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle index e60482c89262..1e3f89401493 100644 --- a/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle +++ b/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'io.reactivex.rxjava2', name: 'rxjava', version: "2.1.3" + library "io.reactivex.rxjava2:rxjava:2.1.3" testImplementation project(':instrumentation:rxjava:rxjava-2.0:testing') } diff --git a/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle b/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle index 2c87b0782e23..eb79ed708a5f 100644 --- a/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle +++ b/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'io.reactivex.rxjava2', name: 'rxjava', version: "2.1.3" + api "io.reactivex.rxjava2:rxjava:2.1.3" implementation deps.guava diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle b/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle index b6f6423781dd..80583060fb5f 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'io.reactivex.rxjava3', name: 'rxjava', version: "3.0.0" + library "io.reactivex.rxjava3:rxjava:3.0.0" implementation project(":instrumentation:rxjava:rxjava-3.0:library") diff --git a/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle b/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle index d90c745145b3..44b85cc4dec8 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle +++ b/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle @@ -1,7 +1,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - library group: 'io.reactivex.rxjava3', name: 'rxjava', version: "3.0.12" + library "io.reactivex.rxjava3:rxjava:3.0.12" testImplementation project(':instrumentation:rxjava:rxjava-3.0:testing') } diff --git a/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle b/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle index 705f4ad9bbbc..959101cf64d6 100644 --- a/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle +++ b/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { api project(':testing-common') - api group: 'io.reactivex.rxjava3', name: 'rxjava', version: "3.0.12" + api "io.reactivex.rxjava3:rxjava:3.0.12" implementation deps.guava diff --git a/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle b/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle index d0adf48e42d2..bf18918827d6 100644 --- a/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle +++ b/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle @@ -26,16 +26,16 @@ compileSlickTestGroovy { } dependencies { - library group: 'org.scala-lang', name: 'scala-library', version: '2.8.0' + library "org.scala-lang:scala-library:2.8.0" - latestDepTestLibrary group: 'org.scala-lang', name: 'scala-library', version: '2.11.+' + latestDepTestLibrary "org.scala-lang:scala-library:2.11.+" testInstrumentation project(':instrumentation:jdbc:javaagent') slickTestImplementation project(':testing-common') slickTestImplementation deps.scala - slickTestImplementation group: 'com.typesafe.slick', name: 'slick_2.11', version: '3.2.0' - slickTestImplementation group: 'com.h2database', name: 'h2', version: '1.4.197' + slickTestImplementation "com.typesafe.slick:slick_2.11:3.2.0" + slickTestImplementation "com.h2database:h2:1.4.197" } // Run Slick library tests along with the rest of tests diff --git a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle index 3985ace9eabd..6aefb8efdf98 100644 --- a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle +++ b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle @@ -10,7 +10,7 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') testInstrumentation project(':instrumentation:grizzly-2.0:javaagent') - testLibrary group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0' + testLibrary "org.glassfish.main.extras:glassfish-embedded-all:4.0" } tasks.withType(Test).configureEach { diff --git a/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle b/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle index 6a29abebbd45..74ea13a2c462 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle +++ b/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle @@ -16,7 +16,7 @@ muzzle { } dependencies { - compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.2' + compileOnly "javax.servlet:servlet-api:2.2" api(project(':instrumentation:servlet:servlet-2.2:library')) implementation(project(':instrumentation:servlet:servlet-common:javaagent')) @@ -25,9 +25,9 @@ dependencies { testImplementation(project(':testing-common')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005' - testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005' + testLibrary "org.eclipse.jetty:jetty-server:7.0.0.v20091005" + testLibrary "org.eclipse.jetty:jetty-servlet:7.0.0.v20091005" - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.+' - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.+' + latestDepTestLibrary "org.eclipse.jetty:jetty-server:7.+" + latestDepTestLibrary "org.eclipse.jetty:jetty-servlet:7.+" } diff --git a/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle b/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle index 62af68f0a6f0..51ffdf9fa9e7 100644 --- a/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle +++ b/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle @@ -5,5 +5,5 @@ dependencies { api(project(':instrumentation:servlet:servlet-javax-common:library')) - compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.2' + compileOnly "javax.servlet:servlet-api:2.2" } diff --git a/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle b/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle index 5b8af8285ad0..72a5ad138371 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle +++ b/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle @@ -15,7 +15,7 @@ muzzle { } dependencies { - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' + compileOnly "javax.servlet:javax.servlet-api:3.0.1" api(project(':instrumentation:servlet:servlet-3.0:library')) implementation(project(':instrumentation:servlet:servlet-common:javaagent')) @@ -25,16 +25,16 @@ dependencies { testImplementation(project(':testing-common')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901' - testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901' - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.0.41' - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.0.41' + testLibrary "org.eclipse.jetty:jetty-server:8.0.0.v20110901" + testLibrary "org.eclipse.jetty:jetty-servlet:8.0.0.v20110901" + testLibrary "org.apache.tomcat.embed:tomcat-embed-core:8.0.41" + testLibrary "org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41" // Jetty 10 seems to refuse to run on java8. // TODO: we need to setup separate test for Jetty 10 when that is released. - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+' - latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+' + latestDepTestLibrary "org.eclipse.jetty:jetty-server:9.+" + latestDepTestLibrary "org.eclipse.jetty:jetty-servlet:9.+" - latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.+' - latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.+' + latestDepTestLibrary "org.apache.tomcat.embed:tomcat-embed-core:9.+" + latestDepTestLibrary "org.apache.tomcat.embed:tomcat-embed-jasper:9.+" } diff --git a/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle b/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle index 2a6db3786ea0..67bda9491c82 100644 --- a/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle +++ b/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle @@ -3,5 +3,5 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { api(project(':instrumentation:servlet:servlet-javax-common:library')) - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' + compileOnly "javax.servlet:javax.servlet-api:3.0.1" } diff --git a/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle b/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle index 7d0f5bf98e49..366f61171d94 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle +++ b/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle @@ -12,10 +12,10 @@ muzzle { dependencies { api(project(':instrumentation:servlet:servlet-5.0:library')) implementation(project(':instrumentation:servlet:servlet-common:javaagent')) - compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' + compileOnly "jakarta.servlet:jakarta.servlet-api:5.0.0" - testLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.0' - testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '11.0.0' - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '10.0.0' - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '10.0.0' + testLibrary "org.eclipse.jetty:jetty-server:11.0.0" + testLibrary "org.eclipse.jetty:jetty-servlet:11.0.0" + testLibrary "org.apache.tomcat.embed:tomcat-embed-core:10.0.0" + testLibrary "org.apache.tomcat.embed:tomcat-embed-jasper:10.0.0" } diff --git a/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle b/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle index 297499abdce0..9a94ae849736 100644 --- a/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle +++ b/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle @@ -3,9 +3,9 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { api(project(':instrumentation:servlet:servlet-common:library')) - compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' + compileOnly "jakarta.servlet:jakarta.servlet-api:5.0.0" - testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0' - testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.6.0' + testImplementation "jakarta.servlet:jakarta.servlet-api:5.0.0" + testImplementation "org.mockito:mockito-core:3.6.0" testImplementation deps.assertj } diff --git a/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle b/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle index 4963bf675228..a5d453a09596 100644 --- a/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle +++ b/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle @@ -18,13 +18,13 @@ dependencies { api(project(':instrumentation:servlet:servlet-javax-common:library')) implementation(project(':instrumentation:servlet:servlet-common:javaagent')) - compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3' + compileOnly "javax.servlet:servlet-api:2.3" testImplementation(project(':testing-common')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } // We don't check testLatestDeps for this module since we have coverage in others like servlet-3.0 - testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005' + testImplementation "org.eclipse.jetty:jetty-server:7.0.0.v20091005" + testImplementation "org.eclipse.jetty:jetty-servlet:7.0.0.v20091005" } diff --git a/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle b/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle index 77b014c400a3..c51049ac3897 100644 --- a/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle +++ b/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle @@ -5,9 +5,9 @@ dependencies { api(project(':instrumentation:servlet:servlet-common:library')) - compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.2' + compileOnly "javax.servlet:servlet-api:2.2" - testImplementation group: 'javax.servlet', name: 'servlet-api', version: '2.2' + testImplementation "javax.servlet:servlet-api:2.2" testImplementation deps.mockito testImplementation deps.assertj } diff --git a/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle b/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle index f820adc5683c..54d10dca11bd 100644 --- a/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle +++ b/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle @@ -11,9 +11,9 @@ muzzle { } dependencies { - library group: 'com.sparkjava', name: 'spark-core', version: '2.3' + library "com.sparkjava:spark-core:2.3" testInstrumentation project(':instrumentation:jetty:jetty-8.0:javaagent') - testLibrary group: 'com.sparkjava', name: 'spark-core', version: '2.4' + testLibrary "com.sparkjava:spark-core:2.4" } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle b/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle index 67582458ed98..e16c415fb940 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle +++ b/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle @@ -10,9 +10,9 @@ muzzle { } dependencies { - library group: 'org.springframework.batch', name: 'spring-batch-core', version: '3.0.0.RELEASE' + library "org.springframework.batch:spring-batch-core:3.0.0.RELEASE" - testImplementation group: 'javax.inject', name: 'javax.inject', version: '1' + testImplementation "javax.inject:javax.inject:1" // SimpleAsyncTaskExecutor context propagation testInstrumentation project(':instrumentation:spring:spring-core-2.0:javaagent') } diff --git a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle index 8d929169ecb7..61b0e27707f5 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle +++ b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle @@ -6,29 +6,29 @@ apply from: "$rootDir/gradle/publish.gradle" sourceCompatibility = '8' dependencies { - implementation group: 'org.springframework.boot', name: 'spring-boot-autoconfigure', version: versions.springboot - annotationProcessor group: 'org.springframework.boot', name: 'spring-boot-autoconfigure-processor', version: versions.springboot - implementation group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final' + implementation "org.springframework.boot:spring-boot-autoconfigure:${versions.springboot}" + annotationProcessor "org.springframework.boot:spring-boot-autoconfigure-processor:${versions.springboot}" + implementation "javax.validation:validation-api:2.0.1.Final" implementation project(':instrumentation:spring:spring-web-3.1:library') implementation project(':instrumentation:spring:spring-webmvc-3.1:library') implementation project(':instrumentation:spring:spring-webflux-5.0:library') - compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: versions.springboot - compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot - compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: versions.springboot + compileOnly "org.springframework.boot:spring-boot-starter-aop:${versions.springboot}" + compileOnly "org.springframework.boot:spring-boot-starter-web:${versions.springboot}" + compileOnly "org.springframework.boot:spring-boot-starter-webflux:${versions.springboot}" compileOnly deps.opentelemetryExtAnnotations compileOnly deps.opentelemetryLogging compileOnly deps.opentelemetryJaeger compileOnly deps.opentelemetryOtlp compileOnly deps.opentelemetryZipkin - compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.30.2' + compileOnly "io.grpc:grpc-api:1.30.2" - testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: versions.springboot - testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: versions.springboot - testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot - testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springboot) { + testImplementation "org.springframework.boot:spring-boot-starter-aop:${versions.springboot}" + testImplementation "org.springframework.boot:spring-boot-starter-webflux:${versions.springboot}" + testImplementation "org.springframework.boot:spring-boot-starter-web:${versions.springboot}" + testImplementation("org.springframework.boot:spring-boot-starter-test:${versions.springboot}") { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } @@ -41,6 +41,6 @@ dependencies { testImplementation deps.opentelemetryJaeger testImplementation deps.opentelemetryOtlp testImplementation deps.opentelemetryZipkin - testImplementation group: 'io.grpc', name: 'grpc-api', version: '1.30.2' - testImplementation group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.30.2' + testImplementation "io.grpc:grpc-api:1.30.2" + testImplementation "io.grpc:grpc-netty-shaded:1.30.2" } diff --git a/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle b/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle index a479b1edac6a..46c4d11854eb 100644 --- a/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle +++ b/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle @@ -9,9 +9,9 @@ muzzle { } dependencies { - library group: 'org.springframework', name: 'spring-core', version: '2.0' + library "org.springframework:spring-core:2.0" // 3.0 introduces submit() methods // 4.0 introduces submitListenable() methods - testLibrary group: 'org.springframework', name: 'spring-core', version: '4.0.0.RELEASE' + testLibrary "org.springframework:spring-core:4.0.0.RELEASE" } \ No newline at end of file diff --git a/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle b/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle index c75a0c1b5617..f643c5cea259 100644 --- a/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle +++ b/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle @@ -22,19 +22,19 @@ muzzle { // For now, that limits support to spring-data-commons 1.9.0 (maybe 1.8.0). // For testing, chose a couple spring-data modules that are old enough to work with 1.9.0. dependencies { - library group: 'org.springframework.data', name: 'spring-data-commons', version: '1.8.0.RELEASE' - compileOnly(group: 'org.springframework', name: 'spring-aop', version: '1.2') + library "org.springframework.data:spring-data-commons:1.8.0.RELEASE" + compileOnly("org.springframework:spring-aop:1.2") - testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock" - testLibrary group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE' - testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.8.0.RELEASE' + testImplementation "org.spockframework:spock-spring:$versions.spock" + testLibrary "org.springframework:spring-test:3.0.0.RELEASE" + testLibrary "org.springframework.data:spring-data-jpa:1.8.0.RELEASE" // JPA dependencies testInstrumentation project(':instrumentation:jdbc:javaagent') - testImplementation group: 'com.mysema.querydsl', name: 'querydsl-jpa', version: '3.7.4' - testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0' - testLibrary group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final' + testImplementation "com.mysema.querydsl:querydsl-jpa:3.7.4" + testImplementation "org.hsqldb:hsqldb:2.0.0" + testLibrary "org.hibernate:hibernate-entitymanager:4.3.0.Final" - latestDepTestLibrary group: 'org.hibernate', name: 'hibernate-entitymanager', version: '5.+' + latestDepTestLibrary "org.hibernate:hibernate-entitymanager:5.+" } diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle b/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle index 0809416e7397..e38b2abd0889 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle @@ -12,6 +12,6 @@ muzzle { dependencies { // 3.2.3 is the first version with which the tests will run. Lower versions require other // classes and packages to be imported. Versions 3.1.0+ work with the instrumentation. - library group: 'org.springframework', name: 'spring-context', version: '3.1.0.RELEASE' - testLibrary group: 'org.springframework', name: 'spring-context', version: '3.2.3.RELEASE' + library "org.springframework:spring-context:3.1.0.RELEASE" + testLibrary "org.springframework:spring-context:3.2.3.RELEASE" } diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle b/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle index 5f9c9849a794..e380609e9963 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle @@ -38,17 +38,17 @@ muzzle { dependencies { implementation project(':instrumentation:spring:spring-webflux-5.0:library') - compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE' - compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE' + compileOnly "org.springframework:spring-webflux:5.0.0.RELEASE" + compileOnly "io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE" testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') testInstrumentation project(':instrumentation:reactor-3.1:javaagent') testInstrumentation project(':instrumentation:reactor-netty:reactor-netty-1.0:javaagent') - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.0.RELEASE' - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.0.RELEASE' - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '2.0.0.RELEASE' - testImplementation group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4' + testLibrary "org.springframework.boot:spring-boot-starter-webflux:2.0.0.RELEASE" + testLibrary "org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE" + testLibrary "org.springframework.boot:spring-boot-starter-reactor-netty:2.0.0.RELEASE" + testImplementation "org.spockframework:spock-spring:1.1-groovy-2.4" } tasks.withType(Test).configureEach { diff --git a/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle b/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle index 5851ab380f8a..6ce5683e87b0 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle +++ b/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle @@ -1,6 +1,6 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { - compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE' - compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE' + compileOnly "org.springframework:spring-webflux:5.0.0.RELEASE" + compileOnly "io.projectreactor.ipc:reactor-netty:0.7.0.RELEASE" } diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle b/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle index db6f9b158683..ee549cb03028 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle @@ -27,10 +27,10 @@ muzzle { } dependencies { - compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '3.1.0.RELEASE' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' -// compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '2.5.6' -// compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.4' + compileOnly "org.springframework:spring-webmvc:3.1.0.RELEASE" + compileOnly "javax.servlet:javax.servlet-api:3.1.0" +// compileOnly "org.springframework:spring-webmvc:2.5.6" +// compileOnly "javax.servlet:servlet-api:2.4" testImplementation(project(':testing-common')) { exclude(module: 'jetty-server') // incompatible servlet api @@ -41,16 +41,16 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') testInstrumentation project(':instrumentation:tomcat:tomcat-7.0:javaagent') - testImplementation group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final' - testImplementation group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final' + testImplementation "javax.validation:validation-api:1.1.0.Final" + testImplementation "org.hibernate:hibernate-validator:5.4.2.Final" - testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock" + testImplementation "org.spockframework:spock-spring:$versions.spock" - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.17.RELEASE' - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.17.RELEASE' - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '1.5.17.RELEASE' + testLibrary "org.springframework.boot:spring-boot-starter-test:1.5.17.RELEASE" + testLibrary "org.springframework.boot:spring-boot-starter-web:1.5.17.RELEASE" + testLibrary "org.springframework.boot:spring-boot-starter-security:1.5.17.RELEASE" - testImplementation group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: '2.0.16.RELEASE' + testImplementation "org.springframework.security.oauth:spring-security-oauth2:2.0.16.RELEASE" // For spring security testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" diff --git a/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle b/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle index bf0912b15172..5ea9c068a5df 100644 --- a/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle +++ b/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle @@ -4,6 +4,6 @@ dependencies { implementation project(':instrumentation:servlet:servlet-common:library') implementation project(':instrumentation:servlet:servlet-javax-common:library') - compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '3.1.0.RELEASE' - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' + compileOnly "org.springframework:spring-webmvc:3.1.0.RELEASE" + compileOnly "javax.servlet:javax.servlet-api:3.1.0" } diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle b/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle index 29a1d8080c11..f98b63b00f65 100644 --- a/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle +++ b/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle @@ -25,16 +25,16 @@ checkstyle { } dependencies { - compileOnly group: 'org.springframework.ws', name: 'spring-ws-core', version: '2.0.0.RELEASE' + compileOnly "org.springframework.ws:spring-ws-core:2.0.0.RELEASE" - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-web-services', version: '2.0.0.RELEASE' - testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.0.0.RELEASE' + testLibrary "org.springframework.boot:spring-boot-starter-web-services:2.0.0.RELEASE" + testLibrary "org.springframework.boot:spring-boot-starter-web:2.0.0.RELEASE" - testImplementation group: 'wsdl4j', name: 'wsdl4j', version: '1.6.3' - testImplementation group: 'com.sun.xml.messaging.saaj', name: 'saaj-impl', version: '1.5.2' - testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.11' - testImplementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.2.11' - testImplementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.2.11' + testImplementation "wsdl4j:wsdl4j:1.6.3" + testImplementation "com.sun.xml.messaging.saaj:saaj-impl:1.5.2" + testImplementation "javax.xml.bind:jaxb-api:2.2.11" + testImplementation "com.sun.xml.bind:jaxb-core:2.2.11" + testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11" testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') } diff --git a/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle b/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle index fe5a00406563..ff85e553cd78 100644 --- a/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle +++ b/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle @@ -13,6 +13,6 @@ dependencies { api group: "org.springframework.boot", name: "spring-boot-starter", version: versions.springboot api project(':instrumentation:spring:starters:spring-starter') api deps.opentelemetryJaeger - implementation group: "io.grpc", name: "grpc-netty-shaded", version: "1.30.2" + implementation "io.grpc:grpc-netty-shaded:1.30.2" } diff --git a/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle b/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle index 8c94886e8127..0a84ba8c2402 100644 --- a/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle +++ b/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle @@ -9,6 +9,6 @@ dependencies { api group: "org.springframework.boot", name: "spring-boot-starter", version: versions.springboot api project(':instrumentation:spring:starters:spring-starter') api deps.opentelemetryOtlp - implementation group: "io.grpc", name: "grpc-netty-shaded", version: "1.30.2" + implementation "io.grpc:grpc-netty-shaded:1.30.2" } diff --git a/instrumentation/spring/starters/spring-starter/spring-starter.gradle b/instrumentation/spring/starters/spring-starter/spring-starter.gradle index 4ae905947e91..00d442f6827d 100644 --- a/instrumentation/spring/starters/spring-starter/spring-starter.gradle +++ b/instrumentation/spring/starters/spring-starter/spring-starter.gradle @@ -7,7 +7,7 @@ sourceCompatibility = '8' dependencies { api group: "org.springframework.boot", name: "spring-boot-starter", version: versions.springboot - api group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: versions.springboot + api "org.springframework.boot:spring-boot-starter-aop:${versions.springboot}" api project(':instrumentation:spring:spring-boot-autoconfigure') api deps.opentelemetryExtAnnotations api deps.opentelemetryApi diff --git a/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle b/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle index beeaad122108..4594ffefb1ce 100644 --- a/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle +++ b/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle @@ -10,7 +10,7 @@ muzzle { } dependencies { - library group: 'net.spy', name: 'spymemcached', version: '2.12.0' + library "net.spy:spymemcached:2.12.0" testImplementation deps.guava testImplementation deps.testcontainers diff --git a/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle b/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle index f4d51664202c..b84079df7b51 100644 --- a/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle +++ b/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle @@ -9,19 +9,19 @@ muzzle { } dependencies { - library group: 'org.apache.struts', name: 'struts2-core', version: '2.3.1' + library "org.apache.struts:struts2-core:2.3.1" // There was no 2.4 version at all. // In version 2.5 Struts Servlet Filter entry point was relocated. // This Servlet Filter is relevant only in setting up the test app and it is not used in // instrumentation. So fixing Struts library version for the test. - latestDepTestLibrary group: 'org.apache.struts', name: 'struts2-core', version: '2.3.+' + latestDepTestLibrary "org.apache.struts:struts2-core:2.3.+" testImplementation(project(':testing-common')) - testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901' - testRuntimeOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' - testRuntimeOnly group: 'javax.servlet', name: 'jsp-api', version: '2.0' + testImplementation "org.eclipse.jetty:jetty-server:8.0.0.v20110901" + testImplementation "org.eclipse.jetty:jetty-servlet:8.0.0.v20110901" + testRuntimeOnly "javax.servlet:javax.servlet-api:3.0.1" + testRuntimeOnly "javax.servlet:jsp-api:2.0" testInstrumentation project(":instrumentation:servlet:servlet-3.0:javaagent") testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') diff --git a/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle b/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle index 5d7136e90bb3..81e67c55ad8d 100644 --- a/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle +++ b/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle @@ -16,8 +16,8 @@ muzzle { dependencies { library 'org.apache.tapestry:tapestry-core:5.4.0' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-webapp', version: '8.0.0.v20110901' - testImplementation group: 'org.jsoup', name: 'jsoup', version: '1.13.1' + testImplementation "org.eclipse.jetty:jetty-webapp:8.0.0.v20110901" + testImplementation "org.jsoup:jsoup:1.13.1" testImplementation 'javax.annotation:javax.annotation-api:1.3.2' testInstrumentation project(':instrumentation:jetty:jetty-8.0:javaagent') diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle b/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle index ae54fff9a470..46652d99b5c7 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle @@ -9,7 +9,7 @@ muzzle { } dependencies { - library group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '10.0.0' + library "org.apache.tomcat.embed:tomcat-embed-core:10.0.0" implementation project(':instrumentation:tomcat:tomcat-common:javaagent') implementation project(':instrumentation:servlet:servlet-5.0:javaagent') // Make sure nothing breaks due to both 7.0 and 10.0 modules being present together diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle b/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle index 8c746a213b19..0bc6bb3dee26 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle @@ -11,7 +11,7 @@ muzzle { } dependencies { - library group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.4' + library "org.apache.tomcat.embed:tomcat-embed-core:7.0.4" implementation project(':instrumentation:tomcat:tomcat-common:javaagent') implementation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') @@ -20,6 +20,6 @@ dependencies { // Tests need at least version 9 to have necessary classes to configure the embedded tomcat... // ... but not newer that version 10, because its servlet 5. - testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '[9.+, 10)' - latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '[9.+, 10)' + testLibrary "org.apache.tomcat.embed:tomcat-embed-core:[9.+, 10)" + latestDepTestLibrary "org.apache.tomcat.embed:tomcat-embed-core:[9.+, 10)" } \ No newline at end of file diff --git a/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle b/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle index 444bd1c00404..43b3581037a8 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle +++ b/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle @@ -2,5 +2,5 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { api(project(':instrumentation:servlet:servlet-common:library')) - compileOnly group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.4' + compileOnly "org.apache.tomcat.embed:tomcat-embed-core:7.0.4" } diff --git a/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle b/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle index 59d50853c23a..04b659534b77 100644 --- a/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle +++ b/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle @@ -10,12 +10,12 @@ muzzle { } dependencies { - library group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9' + library "com.twilio.sdk:twilio:6.6.9" // included to make sure the apache httpclient nested spans are suppressed testInstrumentation project(':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent') - latestDepTestLibrary group: 'com.twilio.sdk', name: 'twilio', version: '7.+' + latestDepTestLibrary "com.twilio.sdk:twilio:7.+" } tasks.withType(Test).configureEach { diff --git a/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle b/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle index 2ffd19b84b32..d093cae8d3e6 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle +++ b/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle @@ -12,25 +12,25 @@ muzzle { ext.vertxVersion = '3.5.0' dependencies { - library group: 'io.vertx', name: 'vertx-web', version: vertxVersion - library group: 'io.vertx', name: 'vertx-rx-java2', version: vertxVersion + library "io.vertx:vertx-web:${vertxVersion}" + library "io.vertx:vertx-rx-java2:${vertxVersion}" testInstrumentation project(':instrumentation:jdbc:javaagent') testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') testInstrumentation project(':instrumentation:vertx-web-3.0:javaagent') //TODO we should include rjxava2 instrumentation here as well - testLibrary group: 'io.vertx', name: 'vertx-web-client', version: vertxVersion - testLibrary group: 'io.vertx', name: 'vertx-jdbc-client', version: vertxVersion - testLibrary group: 'io.vertx', name: 'vertx-circuit-breaker', version: vertxVersion + testLibrary "io.vertx:vertx-web-client:${vertxVersion}" + testLibrary "io.vertx:vertx-jdbc-client:${vertxVersion}" + testLibrary "io.vertx:vertx-circuit-breaker:${vertxVersion}" testImplementation 'org.hsqldb:hsqldb:2.3.4' // Vert.x 4.0 is incompatible with our tests. - latestDepTestLibrary group: 'io.vertx', name: 'vertx-web', version: '3.+' - latestDepTestLibrary group: 'io.vertx', name: 'vertx-web-client', version: '3.+' - latestDepTestLibrary group: 'io.vertx', name: 'vertx-jdbc-client', version: '3.+' - latestDepTestLibrary group: 'io.vertx', name: 'vertx-circuit-breaker', version: '3.+' - latestDepTestLibrary group: 'io.vertx', name: 'vertx-rx-java2', version: '3.+' + latestDepTestLibrary "io.vertx:vertx-web:3.+" + latestDepTestLibrary "io.vertx:vertx-web-client:3.+" + latestDepTestLibrary "io.vertx:vertx-jdbc-client:3.+" + latestDepTestLibrary "io.vertx:vertx-circuit-breaker:3.+" + latestDepTestLibrary "io.vertx:vertx-rx-java2:3.+" } test { diff --git a/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle b/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle index 9f2ed3481244..3318659d074e 100644 --- a/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle +++ b/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle @@ -14,18 +14,18 @@ muzzle { ext.vertxVersion = '3.0.0' dependencies { - library group: 'io.vertx', name: 'vertx-web', version: vertxVersion + library "io.vertx:vertx-web:${vertxVersion}" //We need both version as different versions of Vert.x use different versions of Netty testInstrumentation project(':instrumentation:netty:netty-4.0:javaagent') testInstrumentation project(':instrumentation:netty:netty-4.1:javaagent') testInstrumentation project(':instrumentation:jdbc:javaagent') - testImplementation group: 'io.vertx', name: 'vertx-jdbc-client', version: vertxVersion + testImplementation "io.vertx:vertx-jdbc-client:${vertxVersion}" // Vert.x 4.0 is incompatible with our tests. - latestDepTestLibrary group: 'io.vertx', name: 'vertx-web', version: '3.+' - latestDepTestLibrary group: 'io.vertx', name: 'vertx-web-client', version: '3.+' + latestDepTestLibrary "io.vertx:vertx-web:3.+" + latestDepTestLibrary "io.vertx:vertx-web-client:3.+" } test { diff --git a/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle b/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle index 18d49764e8f6..72e92f21e348 100644 --- a/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle +++ b/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle @@ -10,12 +10,12 @@ muzzle { } dependencies { - library group: 'org.apache.wicket', name: 'wicket', version: '8.0.0' + library "org.apache.wicket:wicket:8.0.0" testImplementation(project(':testing-common')) - testImplementation group: 'org.jsoup', name: 'jsoup', version: '1.13.1' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901' + testImplementation "org.jsoup:jsoup:1.13.1" + testImplementation "org.eclipse.jetty:jetty-server:8.0.0.v20110901" + testImplementation "org.eclipse.jetty:jetty-servlet:8.0.0.v20110901" testInstrumentation project(":instrumentation:servlet:servlet-3.0:javaagent") testInstrumentation project(":instrumentation:servlet:servlet-javax-common:javaagent") diff --git a/javaagent-bootstrap/javaagent-bootstrap.gradle b/javaagent-bootstrap/javaagent-bootstrap.gradle index 7fffea5d3e18..533fba78f77b 100644 --- a/javaagent-bootstrap/javaagent-bootstrap.gradle +++ b/javaagent-bootstrap/javaagent-bootstrap.gradle @@ -33,7 +33,7 @@ dependencies { api deps.opentelemetryApiMetrics compileOnly deps.opentelemetrySdk implementation deps.slf4j - implementation group: 'org.slf4j', name: 'slf4j-simple', version: versions.slf4j + implementation "org.slf4j:slf4j-simple:${versions.slf4j}" // ^ Generally a bad idea for libraries, but we're shadowing. implementation project(':javaagent-api') diff --git a/javaagent-tooling/javaagent-tooling.gradle b/javaagent-tooling/javaagent-tooling.gradle index 14f99a1e2d4f..47ef33b4c1a8 100644 --- a/javaagent-tooling/javaagent-tooling.gradle +++ b/javaagent-tooling/javaagent-tooling.gradle @@ -53,7 +53,7 @@ dependencies { implementation deps.slf4j implementation deps.guava - implementation group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.35.1' + implementation "io.grpc:grpc-netty-shaded:1.35.1" testImplementation project(':testing-common') testImplementation deps.assertj diff --git a/testing-common/integration-tests/integration-tests.gradle b/testing-common/integration-tests/integration-tests.gradle index 652a5fe0e990..57e49060de5c 100644 --- a/testing-common/integration-tests/integration-tests.gradle +++ b/testing-common/integration-tests/integration-tests.gradle @@ -16,11 +16,11 @@ dependencies { testImplementation deps.guava testImplementation deps.opentelemetryExtAnnotations - testImplementation group: 'cglib', name: 'cglib', version: '3.2.5' + testImplementation "cglib:cglib:3.2.5" // test instrumenting java 1.1 bytecode // TODO do we want this? - testImplementation group: 'net.sf.jt400', name: 'jt400', version: '6.1' + testImplementation "net.sf.jt400:jt400:6.1" } test { diff --git a/testing-common/testing-common.gradle b/testing-common/testing-common.gradle index b7a85230a432..5a42b8ce5f50 100644 --- a/testing-common/testing-common.gradle +++ b/testing-common/testing-common.gradle @@ -27,11 +27,11 @@ dependencies { implementation deps.opentelemetryExtAnnotations implementation project(':instrumentation-api') - api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.0' - api group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '4.9.0' + api "com.squareup.okhttp3:okhttp:4.9.0" + api "com.squareup.okhttp3:logging-interceptor:4.9.0" //TODO replace with Servlet API? - implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901' + implementation "org.eclipse.jetty:jetty-server:8.0.0.v20110901" annotationProcessor deps.autoservice compileOnly deps.autoservice diff --git a/testing/agent-exporter/agent-exporter.gradle b/testing/agent-exporter/agent-exporter.gradle index 49ea3e6c389e..ea735e4d5b41 100644 --- a/testing/agent-exporter/agent-exporter.gradle +++ b/testing/agent-exporter/agent-exporter.gradle @@ -18,7 +18,7 @@ dependencies { implementation deps.opentelemetryProto implementation deps.opentelemetryOtlp implementation deps.opentelemetryOtlpMetrics - implementation group: 'io.grpc', name: 'grpc-testing', version: '1.33.1' + implementation "io.grpc:grpc-testing:1.33.1" // Include instrumentations instrumenting core JDK classes tp ensure interoperability with other instrumentation implementation project(':instrumentation:executors:javaagent') From 389816a0f6995bace1e991d203a44d3f43628f96 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 14 May 2021 18:34:06 +0900 Subject: [PATCH 2/3] Even more cleanup --- buildSrc/src/main/groovy/MuzzlePlugin.groovy | 4 +- examples/distro/build.gradle | 10 +-- gradle/dependencies.gradle | 70 ++++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy index c7e2d527e06c..69c45338c1cb 100644 --- a/buildSrc/src/main/groovy/MuzzlePlugin.groovy +++ b/buildSrc/src/main/groovy/MuzzlePlugin.groovy @@ -324,7 +324,7 @@ class MuzzlePlugin implements Plugin { def config = instrumentationProject.configurations.create(taskName) if (!muzzleDirective.coreJdk) { - def dep = instrumentationProject.dependencies.create("$versionArtifact.groupId:$versionArtifact.artifactId:$versionArtifact.version") { + def dep = instrumentationProject."$versionArtifact.groupId:$versionArtifact.artifactId:$versionArtifact.version" { transitive = true } // The following optional transitive dependencies are brought in by some legacy module such as log4j 1.x but are no @@ -339,7 +339,7 @@ class MuzzlePlugin implements Plugin { // Dependency definition without version, use the artifact's version. additionalDependency += ":${versionArtifact.version}" } - config.dependencies.add(instrumentationProject.dependencies.create(additionalDependency) { + config.dependencies.add(instrumentationProject.additionalDependency { transitive = true }) } diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 6eaee28cf2b7..50714f6ff2d1 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -17,12 +17,12 @@ subprojects { versions.opentelemetryJavaagentAlpha = "${versions.opentelemetryJavaagent}-alpha" deps = [ - bytebuddy : dependencies.create("net.bytebuddy:byte-buddy:${versions.bytebuddy}"), - bytebuddyagent : dependencies.create("net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}"), + bytebuddy : "net.bytebuddy:byte-buddy:${versions.bytebuddy}", + bytebuddyagent : "net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}", autoservice : [ - dependencies.create("com.google.auto.service:auto-service:1.0-rc7"), - dependencies.create("com.google.auto:auto-common:0.8"), - dependencies.create("com.google.guava:guava:${versions.guava}"), + "com.google.auto.service:auto-service:1.0-rc7", + "com.google.auto:auto-common:0.8", + "com.google.guava:guava:${versions.guava}", ], autoValueAnnotations: "com.google.auto.value:auto-value-annotations:${versions.autoValue}", ] diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 500111e051b7..71e19360fd1e 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -40,43 +40,43 @@ ext { deps = [ // OpenTelemetry - opentelemetryApi : dependencies.create("io.opentelemetry:opentelemetry-api:${versions.opentelemetry}"), - opentelemetryApiMetrics : dependencies.create("io.opentelemetry:opentelemetry-api-metrics:${versions.opentelemetryAlpha}"), - opentelemetryExtAnnotations : dependencies.create("io.opentelemetry:opentelemetry-extension-annotations:${versions.opentelemetry}"), - opentelemetryExtAws : dependencies.create("io.opentelemetry:opentelemetry-extension-aws:${versions.opentelemetry}"), - opentelemetryContext : dependencies.create("io.opentelemetry:opentelemetry-context:${versions.opentelemetry}"), - opentelemetryKotlin : dependencies.create("io.opentelemetry:opentelemetry-extension-kotlin:${versions.opentelemetry}"), - opentelemetryLogging : dependencies.create("io.opentelemetry:opentelemetry-exporter-logging:${versions.opentelemetry}"), - opentelemetryTraceProps : dependencies.create("io.opentelemetry:opentelemetry-extension-trace-propagators:${versions.opentelemetry}"), - opentelemetrySdk : dependencies.create("io.opentelemetry:opentelemetry-sdk:${versions.opentelemetry}"), - opentelemetrySdkAutoconfigure: dependencies.create("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions.opentelemetryAlpha}"), - opentelemetrySdkMetrics : dependencies.create("io.opentelemetry:opentelemetry-sdk-metrics:${versions.opentelemetryAlpha}"), - opentelemetryJaeger : dependencies.create("io.opentelemetry:opentelemetry-exporter-jaeger:${versions.opentelemetry}"), - opentelemetryOtlp : dependencies.create("io.opentelemetry:opentelemetry-exporter-otlp:${versions.opentelemetry}"), - opentelemetryOtlpMetrics : dependencies.create("io.opentelemetry:opentelemetry-exporter-otlp-metrics:${versions.opentelemetryAlpha}"), - opentelemetryZipkin : dependencies.create("io.opentelemetry:opentelemetry-exporter-zipkin:${versions.opentelemetry}"), - opentelemetryPrometheus : dependencies.create("io.opentelemetry:opentelemetry-exporter-prometheus:${versions.opentelemetryAlpha}"), - opentelemetryLogging : dependencies.create("io.opentelemetry:opentelemetry-exporter-logging:${versions.opentelemetry}"), - opentelemetryProto : dependencies.create("io.opentelemetry:opentelemetry-proto:${versions.opentelemetryAlpha}"), - opentelemetryResources : dependencies.create("io.opentelemetry:opentelemetry-sdk-extension-resources:${versions.opentelemetry}"), - opentelemetrySdkTesting : dependencies.create("io.opentelemetry:opentelemetry-sdk-testing:${versions.opentelemetry}"), - opentelemetrySemConv : dependencies.create("io.opentelemetry:opentelemetry-semconv:${versions.opentelemetryAlpha}"), + opentelemetryApi : "io.opentelemetry:opentelemetry-api:${versions.opentelemetry}", + opentelemetryApiMetrics : "io.opentelemetry:opentelemetry-api-metrics:${versions.opentelemetryAlpha}", + opentelemetryExtAnnotations : "io.opentelemetry:opentelemetry-extension-annotations:${versions.opentelemetry}", + opentelemetryExtAws : "io.opentelemetry:opentelemetry-extension-aws:${versions.opentelemetry}", + opentelemetryContext : "io.opentelemetry:opentelemetry-context:${versions.opentelemetry}", + opentelemetryKotlin : "io.opentelemetry:opentelemetry-extension-kotlin:${versions.opentelemetry}", + opentelemetryLogging : "io.opentelemetry:opentelemetry-exporter-logging:${versions.opentelemetry}", + opentelemetryTraceProps : "io.opentelemetry:opentelemetry-extension-trace-propagators:${versions.opentelemetry}", + opentelemetrySdk : "io.opentelemetry:opentelemetry-sdk:${versions.opentelemetry}", + opentelemetrySdkAutoconfigure: "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions.opentelemetryAlpha}", + opentelemetrySdkMetrics : "io.opentelemetry:opentelemetry-sdk-metrics:${versions.opentelemetryAlpha}", + opentelemetryJaeger : "io.opentelemetry:opentelemetry-exporter-jaeger:${versions.opentelemetry}", + opentelemetryOtlp : "io.opentelemetry:opentelemetry-exporter-otlp:${versions.opentelemetry}", + opentelemetryOtlpMetrics : "io.opentelemetry:opentelemetry-exporter-otlp-metrics:${versions.opentelemetryAlpha}", + opentelemetryZipkin : "io.opentelemetry:opentelemetry-exporter-zipkin:${versions.opentelemetry}", + opentelemetryPrometheus : "io.opentelemetry:opentelemetry-exporter-prometheus:${versions.opentelemetryAlpha}", + opentelemetryLogging : "io.opentelemetry:opentelemetry-exporter-logging:${versions.opentelemetry}", + opentelemetryProto : "io.opentelemetry:opentelemetry-proto:${versions.opentelemetryAlpha}", + opentelemetryResources : "io.opentelemetry:opentelemetry-sdk-extension-resources:${versions.opentelemetry}", + opentelemetrySdkTesting : "io.opentelemetry:opentelemetry-sdk-testing:${versions.opentelemetry}", + opentelemetrySemConv : "io.opentelemetry:opentelemetry-semconv:${versions.opentelemetryAlpha}", // General slf4j : "org.slf4j:slf4j-api:${versions.slf4j}", guava : "com.google.guava:guava:$versions.guava", - bytebuddy : dependencies.create("net.bytebuddy:byte-buddy:${versions.bytebuddy}"), - bytebuddyagent : dependencies.create("net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}"), + bytebuddy : "net.bytebuddy:byte-buddy:${versions.bytebuddy}", + bytebuddyagent : "net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}", autoservice : [ - dependencies.create("com.google.auto.service:auto-service:1.0-rc7"), - dependencies.create("com.google.auto:auto-common:0.8"), + "com.google.auto.service:auto-service:1.0-rc7", + "com.google.auto:auto-common:0.8", ], autoValueAnnotations : "com.google.auto.value:auto-value-annotations:${versions.autoValue}", // annotation processor autoValue : "com.google.auto.value:auto-value:${versions.autoValue}", prometheus : [ - dependencies.create("io.prometheus:simpleclient:${versions.prometheus}"), - dependencies.create("io.prometheus:simpleclient_httpserver:${versions.prometheus}"), + "io.prometheus:simpleclient:${versions.prometheus}", + "io.prometheus:simpleclient_httpserver:${versions.prometheus}", ], caffeine : "com.github.ben-manes.caffeine:caffeine:${versions.caffeine}", weaklockfree : "com.blogspot.mydailyjava:weak-lock-free:${versions.weaklockfree}", @@ -88,20 +88,20 @@ ext { exclude group: 'org.codehaus.groovy', module: 'groovy-all' }), // Used by Spock for mocking: - dependencies.create("org.objenesis:objenesis:3.1") + "org.objenesis:objenesis:3.1" ], groovy : "org.codehaus.groovy:groovy-all:${versions.groovy}", systemLambda : "com.github.stefanbirkner:system-lambda:${versions.systemLambda}", testcontainers : "org.testcontainers:testcontainers:${versions.testcontainers}", testLogging : [ - dependencies.create("ch.qos.logback:logback-classic:${versions.logback}"), - dependencies.create("org.slf4j:log4j-over-slf4j:${versions.slf4j}"), - dependencies.create("org.slf4j:jcl-over-slf4j:${versions.slf4j}"), - dependencies.create("org.slf4j:jul-to-slf4j:${versions.slf4j}"), + "ch.qos.logback:logback-classic:${versions.logback}", + "org.slf4j:log4j-over-slf4j:${versions.slf4j}", + "org.slf4j:jcl-over-slf4j:${versions.slf4j}", + "org.slf4j:jul-to-slf4j:${versions.slf4j}", ], - scala : dependencies.create("org.scala-lang:scala-library:${versions.scala}"), - kotlin : dependencies.create("org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"), - coroutines : dependencies.create("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}"), + scala : "org.scala-lang:scala-library:${versions.scala}", + kotlin : "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}", + coroutines : "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}", junitApi : "org.junit.jupiter:junit-jupiter-api:${versions.junit5}", assertj : "org.assertj:assertj-core:${versions.assertj}", awaitility : "org.awaitility:awaitility:${versions.awaitility}", From cca85b4d494d28b2e5be57faf308a6056fd7dded Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Sat, 15 May 2021 15:05:25 +0900 Subject: [PATCH 3/3] Revert mistake --- buildSrc/src/main/groovy/MuzzlePlugin.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy index 69c45338c1cb..c7e2d527e06c 100644 --- a/buildSrc/src/main/groovy/MuzzlePlugin.groovy +++ b/buildSrc/src/main/groovy/MuzzlePlugin.groovy @@ -324,7 +324,7 @@ class MuzzlePlugin implements Plugin { def config = instrumentationProject.configurations.create(taskName) if (!muzzleDirective.coreJdk) { - def dep = instrumentationProject."$versionArtifact.groupId:$versionArtifact.artifactId:$versionArtifact.version" { + def dep = instrumentationProject.dependencies.create("$versionArtifact.groupId:$versionArtifact.artifactId:$versionArtifact.version") { transitive = true } // The following optional transitive dependencies are brought in by some legacy module such as log4j 1.x but are no @@ -339,7 +339,7 @@ class MuzzlePlugin implements Plugin { // Dependency definition without version, use the artifact's version. additionalDependency += ":${versionArtifact.version}" } - config.dependencies.add(instrumentationProject.additionalDependency { + config.dependencies.add(instrumentationProject.dependencies.create(additionalDependency) { transitive = true }) }