Switch to colon notation for dependencies. (#2994)

* Switch to colon notation for dependencies.

* Even more cleanup

* Revert mistake

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 {

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"
 }

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           : "net.bytebuddy:byte-buddy:${versions.bytebuddy}",
+      bytebuddyagent      : "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}"),
+        "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}",
     ]

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"
 }

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             : "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(group: 'net.bytebuddy', name: 'byte-buddy', version: "${versions.bytebuddy}"),
-    bytebuddyagent               : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"),
+    bytebuddy                    : "net.bytebuddy:byte-buddy:${versions.bytebuddy}",
+    bytebuddyagent               : "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'),
+      "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(group: 'io.prometheus', name: 'simpleclient', version: "${versions.prometheus}"),
-      dependencies.create(group: 'io.prometheus', name: 'simpleclient_httpserver', version: "${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(group: 'org.objenesis', name: 'objenesis', version: '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(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),
+      "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(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                        : "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}",

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 {

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 {

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

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