Merge branch '1.1.x'

micrometer-metrics · Sep 21, 2023 · 75e958d · 75e958d
2 parents 5ce33ad + 9e26693
commit 75e958d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle
@@ -8,13 +8,10 @@ dependencies {
 	optionalApi 'javax.servlet:javax.servlet-api'
 	optionalApi 'jakarta.platform:jakarta.jakartaee-web-api'
 
-	api("io.zipkin.brave:brave") {
-		exclude group: "io.zipkin.reporter2"
-		exclude group: "io.zipkin.zipkin2"
-	}
-	api("io.zipkin.brave:brave-context-slf4j")
-	api("io.zipkin.brave:brave-instrumentation-http")
-	api("io.zipkin.aws:brave-propagation-aws")
+	api 'io.zipkin.brave:brave'
+	api 'io.zipkin.brave:brave-context-slf4j'
+	api 'io.zipkin.brave:brave-instrumentation-http'
+	api 'io.zipkin.aws:brave-propagation-aws'
 
 	testImplementation project(':micrometer-tracing-test')
 	testImplementation 'io.micrometer:micrometer-core'
@@ -27,3 +24,8 @@ dependencies {
 	testImplementation 'io.projectreactor:reactor-core'
 	testImplementation 'io.projectreactor:reactor-core-micrometer'
 }
+
+configurations.api {
+	exclude group: 'io.zipkin.reporter2'
+	exclude group: 'io.zipkin.zipkin2'
+}
diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle
@@ -7,15 +7,9 @@ dependencies {
 	api 'io.micrometer:micrometer-observation'
 
 	// Brave
-	optionalImplementation('io.zipkin.brave:brave') {
-		exclude group: 'io.zipkin.reporter2'
-		exclude group: 'io.zipkin.zipkin2'
-	}
 	optionalImplementation project(':micrometer-tracing-bridge-brave')
-	optionalImplementation('io.zipkin.brave:brave-instrumentation-http') {
-		exclude group: "io.zipkin.reporter2"
-		exclude group: "io.zipkin.zipkin2"
-	}
+	optionalImplementation 'io.zipkin.brave:brave'
+	optionalImplementation 'io.zipkin.brave:brave-instrumentation-http'
 
 	// OTel
 	optionalImplementation project(':micrometer-tracing-bridge-otel')
@@ -35,3 +29,8 @@ dependencies {
 	testImplementation 'ch.qos.logback:logback-classic'
 	testImplementation 'org.mockito:mockito-core'
 }
+
+configurations.optionalImplementation {
+	exclude group: 'io.zipkin.reporter2'
+	exclude group: 'io.zipkin.zipkin2'
+}
diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.enterprise' version '3.14.1'
+	id 'com.gradle.enterprise' version '3.15'
 	id 'io.spring.ge.conventions' version '0.0.14'
 	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }