Made aspectj deps optional

micrometer-metrics · Jun 19, 2024 · 706ef1a · 706ef1a
1 parent 1d0c2c9
commit 706ef1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -82,9 +82,8 @@ dependencies {
     }
 
     // Aspects
-    implementation libs.aspectjrt
-    java11Implementation libs.aspectjrt
-    optionalApi 'org.aspectj:aspectjweaver'
+    optionalApi libs.aspectjrt
+    java11RuntimeOnly libs.aspectjrt
 
     // instrumentation options
     optionalApi 'io.dropwizard.metrics:metrics-core' // TODO move dropwizard out of core module? DropwizardMeterRegistry for e.g. JMX registry
@@ -212,6 +211,8 @@ dependencies {
     testImplementation 'io.grpc:grpc-inprocess'
     testImplementation 'io.grpc:grpc-testing-proto'
     testImplementation 'com.squareup.retrofit2:retrofit'
+
+    testImplementation 'org.aspectj:aspectjweaver'
 }
 
 task shenandoahTest(type: Test) {

diff --git a/micrometer-observation/build.gradle b/micrometer-observation/build.gradle
@@ -25,8 +25,7 @@ dependencies {
     optionalApi 'javax.servlet:javax.servlet-api'
 
     // Aspects
-    implementation libs.aspectjrt   
-    optionalApi 'org.aspectj:aspectjweaver'
+    optionalApi libs.aspectjrt
 
     // log monitoring
     testImplementation 'ch.qos.logback:logback-classic'
@@ -47,4 +46,5 @@ dependencies {
 
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'org.awaitility:awaitility'
+    testImplementation 'org.aspectj:aspectjweaver'
 }