Add gradle otel.java-conventions where missing

trask · trask · commit d0e09f877674 · 2024-11-19T15:14:46.000-08:00
diff --git a/jmx-metrics/build.gradle.kts b/jmx-metrics/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  id("otel.java-conventions")
   application
   id("com.github.johnrengelman.shadow")
 
diff --git a/jmx-scraper/test-app/build.gradle.kts b/jmx-scraper/test-app/build.gradle.kts
@@ -1,15 +1,11 @@
 plugins {
+  id("otel.java-conventions")
+
   application
 }
 
 description = "JMX metrics scraper - test application"
 
-java {
-  toolchain {
-    languageVersion = JavaLanguageVersion.of(8)
-  }
-}
-
 tasks {
   jar {
     manifest {
diff --git a/jmx-scraper/test-webapp/build.gradle.kts b/jmx-scraper/test-webapp/build.gradle.kts
@@ -1,4 +1,6 @@
 plugins {
+  id("otel.java-conventions")
+
   war
 }
 
@@ -7,9 +9,3 @@ description = "JMX metrics scraper - test web application"
 dependencies {
   providedCompile("jakarta.servlet:jakarta.servlet-api:5.0.0")
 }
-
-java {
-  toolchain {
-    languageVersion = JavaLanguageVersion.of(8)
-  }
-}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`plugins {`
	`2`	`+ id("otel.java-conventions")`
`2`	`3`	`application`
`3`	`4`	`id("com.github.johnrengelman.shadow")`
`4`	`5`