diff --git a/micrometer-test-aspectj-ltw/build.gradle b/micrometer-test-aspectj-ltw/build.gradle index 57ad0df217..0ce23e5c61 100644 --- a/micrometer-test-aspectj-ltw/build.gradle +++ b/micrometer-test-aspectj-ltw/build.gradle @@ -19,5 +19,7 @@ dependencies { test { useJUnitPlatform() - jvmArgs '-javaagent:' + configurations.agents.files.find { it.name.startsWith('aspectjweaver') } + jvmArgs '-javaagent:' + configurations.agents.files.find { it.name.startsWith('aspectjweaver') }, + // needed for Java 16+, until upgrading to AspectJ 1.9.21.1, see https://github.com/eclipse-aspectj/aspectj/blob/master/docs/release/README-1.9.20.adoc#use-ltw-on-java-16 + '--add-opens=java.base/java.lang=ALL-UNNAMED' } diff --git a/micrometer-test-aspectj-ltw/src/test/java/io/micrometer/test/ltw/MeasuredClassTest.java b/micrometer-test-aspectj-ltw/src/test/java/io/micrometer/test/ltw/MeasuredClassTest.java index 57d8a3da8b..dfcdb703fe 100644 --- a/micrometer-test-aspectj-ltw/src/test/java/io/micrometer/test/ltw/MeasuredClassTest.java +++ b/micrometer-test-aspectj-ltw/src/test/java/io/micrometer/test/ltw/MeasuredClassTest.java @@ -27,15 +27,11 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledForJreRange; -import org.junit.jupiter.api.condition.JRE; import java.util.Collection; import static org.assertj.core.api.BDDAssertions.then; -@DisabledForJreRange(min = JRE.JAVA_17, - disabledReason = "See https://github.com/micrometer-metrics/micrometer/pull/5401#issuecomment-2308440259") class MeasuredClassTest { MeterRegistry registry = new SimpleMeterRegistry();