Skip to content

Commit f89ff6f

Browse files
committed
fix test
1 parent 02c633e commit f89ff6f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

micrometer-spring-legacy/src/main/java/io/micrometer/spring/autoconfigure/web/jetty/JettyMetricsConfiguration.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
import io.micrometer.core.instrument.MeterRegistry;
1919
import io.micrometer.core.instrument.binder.jetty.InstrumentedQueuedThreadPool;
2020
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
21+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2122
import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
2223
import org.springframework.context.annotation.Bean;
2324
import org.springframework.context.annotation.Configuration;
2425

2526
import java.util.Collections;
2627

2728
@Configuration
28-
@ConditionalOnClass(name = {
29-
"org.eclipse.jetty.server.Server",
30-
"org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory"
31-
})
29+
@ConditionalOnClass(name = "org.eclipse.jetty.server.Server")
30+
@ConditionalOnMissingClass("org.apache.catalina.startup.Tomcat")
3231
public class JettyMetricsConfiguration {
3332

3433
@Bean

0 commit comments

Comments
 (0)