Define dependency versions in one place (#152)

pavolloffay · web-flow · commit a7e502d90b10 · 2020-12-03T18:44:55.000+01:00
* Define dependency versions on one place

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* versions

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,6 +27,12 @@ subprojects {
     group = "org.hypertrace.agent"
     description = "Hypertrace OpenTelemetry Javaagent"
 
+    extra.set("versions", mapOf(
+            "opentelemetry" to "0.11.0",
+            "opentelemetry_java_agent" to "0.11.0",
+            "byte_buddy" to "1.10.18"
+    ))
+
     apply<JavaPlugin>()
     apply(plugin = "com.diffplug.spotless")
     apply(from = "$rootDir/gradle/spotless.gradle")
diff --git a/filter-api/build.gradle.kts b/filter-api/build.gradle.kts
@@ -2,8 +2,10 @@ plugins {
    `java-library`
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-   api("io.opentelemetry:opentelemetry-api:0.11.0")
+   api("io.opentelemetry:opentelemetry-api:${versions["opentelemetry"]}")
    api(project(":javaagent-core"))
    implementation("com.google.auto.service:auto-service:1.0-rc7")
    annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
diff --git a/instrumentation/apache-httpclient-4.0/build.gradle.kts b/instrumentation/apache-httpclient-4.0/build.gradle.kts
@@ -36,9 +36,11 @@ afterEvaluate{
     ).configure()
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
     implementation("org.apache.httpcomponents:httpclient:4.0")
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:0.11.0")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:${versions["opentelemetry_java_agent"]}")
 
     testImplementation(project(":testing-common"))
 }
diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts
@@ -3,17 +3,19 @@ plugins {
     `java-library`
 }
 
+val versions: Map<String, String> by extra
+
 subprojects {
     dependencies {
         implementation("org.slf4j:slf4j-api:1.7.30")
         implementation("com.google.auto.service:auto-service:1.0-rc7")
         annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
-        implementation("net.bytebuddy:byte-buddy:1.10.18")
+        implementation("net.bytebuddy:byte-buddy:${versions["byte_buddy"]}")
 
-        implementation("io.opentelemetry:opentelemetry-api:0.11.0")
-        implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.11.0")
-        implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.11.0")
-        implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:0.11.0")
+        implementation("io.opentelemetry:opentelemetry-api:${versions["opentelemetry"]}")
+        implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions["opentelemetry_java_agent"]}")
+        implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-api:${versions["opentelemetry_java_agent"]}")
+        implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions["opentelemetry_java_agent"]}")
         implementation(project(":javaagent-core"))
         implementation(project(":filter-api"))
     }
diff --git a/instrumentation/grpc-1.5/build.gradle.kts b/instrumentation/grpc-1.5/build.gradle.kts
@@ -53,8 +53,10 @@ protobuf {
     }
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.5:0.11.0")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.5:${versions["opentelemetry_java_agent"]}")
     api("io.opentelemetry.instrumentation:opentelemetry-grpc-1.5:0.11.0")
 
     compileOnly("io.grpc:grpc-core:1.5.0")
diff --git a/instrumentation/okhttp/okhttp-3.0/build.gradle.kts b/instrumentation/okhttp/okhttp-3.0/build.gradle.kts
@@ -22,8 +22,10 @@ afterEvaluate{
     ).configure()
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-okhttp-3.0:0.11.0")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-okhttp-3.0:${versions["opentelemetry_java_agent"]}")
 
     compileOnly("com.squareup.okhttp3:okhttp:3.0.0")
 
diff --git a/instrumentation/servlet/servlet-2.3/build.gradle.kts b/instrumentation/servlet/servlet-2.3/build.gradle.kts
@@ -26,10 +26,12 @@ afterEvaluate{
     ).configure()
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
     api(project(":instrumentation:servlet:servlet-common"))
 
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-2.2:0.11.0")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-2.2:${versions["opentelemetry_java_agent"]}")
 
     compileOnly("javax.servlet:servlet-api:2.3")
 
diff --git a/instrumentation/servlet/servlet-3.0/build.gradle.kts b/instrumentation/servlet/servlet-3.0/build.gradle.kts
@@ -26,10 +26,12 @@ afterEvaluate{
     ).configure()
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
     api(project(":instrumentation:servlet:servlet-common"))
 
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.11.0")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}")
 
     compileOnly("javax.servlet:javax.servlet-api:3.0.1")
 
diff --git a/instrumentation/servlet/servlet-3.1/build.gradle.kts b/instrumentation/servlet/servlet-3.1/build.gradle.kts
@@ -27,10 +27,12 @@ afterEvaluate{
     ).configure()
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
     api(project(":instrumentation:servlet:servlet-common"))
 
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.11.0")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}")
 
     compileOnly("javax.servlet:javax.servlet-api:3.1.0")
 
diff --git a/instrumentation/spark-2.3/build.gradle.kts b/instrumentation/spark-2.3/build.gradle.kts
@@ -22,12 +22,14 @@ afterEvaluate{
     ).configure()
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
     api(project(":instrumentation:servlet:servlet-3.1"))
 
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-spark-2.3:0.11.0")
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:0.11.0")
-    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jetty-8.0:0.11.0")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-spark-2.3:${versions["opentelemetry_java_agent"]}")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:${versions["opentelemetry_java_agent"]}")
+    api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-jetty-8.0:${versions["opentelemetry_java_agent"]}")
 
     compileOnly("com.sparkjava:spark-core:2.3")
 
diff --git a/javaagent-bootstrap/build.gradle.kts b/javaagent-bootstrap/build.gradle.kts
@@ -4,9 +4,11 @@ plugins {
     `java-library`
 }
 
+val versions: Map<String, String> by extra
+
 dependencies{
-    api("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.11.0")
-    api("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.11.0")
+    api("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions["opentelemetry_java_agent"]}")
+    api("io.opentelemetry.javaagent:opentelemetry-javaagent-api:${versions["opentelemetry_java_agent"]}")
     implementation(project(":javaagent-core"))
     implementation(project(":filter-api"))
 }
diff --git a/javaagent-core/build.gradle.kts b/javaagent-core/build.gradle.kts
@@ -21,8 +21,10 @@ idea {
     }
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-    api("io.opentelemetry:opentelemetry-api:0.11.0")
+    api("io.opentelemetry:opentelemetry-api:${versions["opentelemetry"]}")
     implementation("org.slf4j:slf4j-api:1.7.30")
 
     api("com.google.protobuf:protobuf-java:3.11.4")
diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts
@@ -9,10 +9,12 @@ val instrumentationMuzzle by configurations.creating {
     extendsFrom(configurations.api.get())
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-    api("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.11.0")
-    api("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.11.0")
-    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.11.0")
+    api("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions["opentelemetry_java_agent"]}")
+    api("io.opentelemetry.javaagent:opentelemetry-javaagent-api:${versions["opentelemetry_java_agent"]}")
+    instrumentationMuzzle("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions["opentelemetry_java_agent"]}")
     instrumentationMuzzle("net.bytebuddy:byte-buddy:1.10.18")
     instrumentationMuzzle("net.bytebuddy:byte-buddy-agent:1.10.18")
     instrumentationMuzzle("com.blogspot.mydailyjava:weak-lock-free:0.15")
diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
@@ -4,12 +4,14 @@ plugins {
     id("org.hypertrace.publish-plugin")
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
     // pin released version or snapshot with pinned version
     // update the dependencies also in the instrumentations sub-projects
     // https://oss.jfrog.org/artifactory/oss-snapshot-local/io/opentelemetry/instrumentation/auto/
     // https://dl.bintray.com/open-telemetry/maven/
-    implementation("io.opentelemetry.javaagent", "opentelemetry-javaagent", version = "0.11.0", classifier = "all")
+    implementation("io.opentelemetry.javaagent", "opentelemetry-javaagent", version = "${versions["opentelemetry_java_agent"]}", classifier = "all")
     implementation(project(":javaagent-core"))
     implementation(project(":filter-api"))
     implementation(project(":filter-custom-opa"))
@@ -71,8 +73,7 @@ tasks {
         manifest {
             attributes.put("Implementation-Title", "javaagent")
             attributes.put("Implementation-Version", project.version)
-            // TODO set version from a property
-            attributes.put("OpenTelemetry-Instrumentation-Version", "0.11.0")
+            attributes.put("OpenTelemetry-Instrumentation-Version", "${versions["opentelemetry_java_agent"]}")
             attributes.put("Implementation-Vendor", "Hypertrace.org")
             attributes.put("Implementation-Url", "https://github.com/hypertrace/javaagent")
             attributes.put("Main-Class", "io.opentelemetry.javaagent.OpenTelemetryAgent")
diff --git a/otel-extensions/build.gradle.kts b/otel-extensions/build.gradle.kts
@@ -2,13 +2,15 @@ plugins {
     `java-library`
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-    compileOnly("io.opentelemetry:opentelemetry-sdk:0.11.0")
-    implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:0.11.0")
+    compileOnly("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
+    implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions["opentelemetry_java_agent"]}")
 
     implementation("org.slf4j:slf4j-api:1.7.30")
     implementation("com.google.auto.service:auto-service:1.0-rc7")
     annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
 
-    testImplementation("io.opentelemetry:opentelemetry-sdk:0.11.0")
+    testImplementation("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
 }
diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts
@@ -2,13 +2,15 @@ plugins {
     `java-library`
 }
 
+val versions: Map<String, String> by extra
+
 dependencies{
     testImplementation(project(":javaagent-core"))
     testImplementation("org.testcontainers:testcontainers:1.15.0")
     testImplementation("com.squareup.okhttp3:okhttp:4.9.0")
     testImplementation("org.awaitility:awaitility:4.0.3")
-    testImplementation("io.opentelemetry:opentelemetry-proto:0.11.0")
-    testImplementation("io.opentelemetry:opentelemetry-sdk:0.11.0")
+    testImplementation("io.opentelemetry:opentelemetry-proto:${versions["opentelemetry"]}")
+    testImplementation("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
     testImplementation("com.google.protobuf:protobuf-java-util:3.13.0")
 }
 
diff --git a/testing-bootstrap/build.gradle.kts b/testing-bootstrap/build.gradle.kts
@@ -7,9 +7,11 @@ plugins {
 // running tests, we simulate this by adding the jar produced by this project to the bootstrap
 // classpath.
 
+val versions: Map<String, String> by extra
+
 dependencies {
-    api("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.11.0")
-    api("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.11.0")
+    api("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions["opentelemetry_java_agent"]}")
+    api("io.opentelemetry.javaagent:opentelemetry-javaagent-api:${versions["opentelemetry_java_agent"]}")
     implementation(project(":javaagent-core"))
     implementation(project(":filter-api"))
 }
diff --git a/testing-common/build.gradle.kts b/testing-common/build.gradle.kts
@@ -7,18 +7,20 @@ configurations {
     implementation.get().extendsFrom(project(":").configurations["testDependencies"])
 }
 
+val versions: Map<String, String> by extra
+
 dependencies {
-    api("io.opentelemetry:opentelemetry-api:0.11.0")
-    api("io.opentelemetry:opentelemetry-sdk:0.11.0")
+    api("io.opentelemetry:opentelemetry-api:${versions["opentelemetry"]}")
+    api("io.opentelemetry:opentelemetry-sdk:${versions["opentelemetry"]}")
     api("com.squareup.okhttp3:okhttp:4.9.0")
-    implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.11.0")
-    implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:0.11.0")
+    implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions["opentelemetry_java_agent"]}")
+    implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions["opentelemetry_java_agent"]}")
     implementation("ch.qos.logback:logback-classic:1.2.3")
     implementation("org.slf4j:log4j-over-slf4j:1.7.30")
     implementation("org.slf4j:jcl-over-slf4j:1.7.30")
     implementation("org.slf4j:jul-to-slf4j:1.7.30")
-    implementation("net.bytebuddy:byte-buddy:1.10.18")
-    implementation("net.bytebuddy:byte-buddy-agent:1.10.18")
+    implementation("net.bytebuddy:byte-buddy:${versions["byte_buddy"]}")
+    implementation("net.bytebuddy:byte-buddy-agent:${versions["byte_buddy"]}")
     implementation("com.google.auto.service:auto-service:1.0-rc7")
     implementation("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
 }

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,11 @@ afterEvaluate{`
`36`	`36`	`).configure()`
`37`	`37`	`}`
`38`	`38`
	`39`	`+val versions: Map<String, String> by extra`
	`40`	`+`
`39`	`41`	`dependencies {`
`40`	`42`	`implementation("org.apache.httpcomponents:httpclient:4.0")`
`41`		`- api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:0.11.0")`
	`43`	`+ api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:${versions["opentelemetry_java_agent"]}")`
`42`	`44`
`43`	`45`	`testImplementation(project(":testing-common"))`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,10 @@ protobuf {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
	`56`	`+val versions: Map<String, String> by extra`
	`57`	`+`
`56`	`58`	`dependencies {`
`57`		`- api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.5:0.11.0")`
	`59`	`+ api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.5:${versions["opentelemetry_java_agent"]}")`
`58`	`60`	`api("io.opentelemetry.instrumentation:opentelemetry-grpc-1.5:0.11.0")`
`59`	`61`
`60`	`62`	`compileOnly("io.grpc:grpc-core:1.5.0")`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,10 @@ afterEvaluate{`
`22`	`22`	`).configure()`
`23`	`23`	`}`
`24`	`24`
	`25`	`+val versions: Map<String, String> by extra`
	`26`	`+`
`25`	`27`	`dependencies {`
`26`		`- api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-okhttp-3.0:0.11.0")`
	`28`	`+ api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-okhttp-3.0:${versions["opentelemetry_java_agent"]}")`
`27`	`29`
`28`	`30`	`compileOnly("com.squareup.okhttp3:okhttp:3.0.0")`
`29`	`31`