fix test

micrometer-metrics · May 19, 2018 · f89ff6f · f89ff6f
1 parent 02c633e
commit f89ff6f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...src/main/java/io/micrometer/spring/autoconfigure/web/jetty/JettyMetricsConfiguration.java b/...src/main/java/io/micrometer/spring/autoconfigure/web/jetty/JettyMetricsConfiguration.java
@@ -18,17 +18,16 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.jetty.InstrumentedQueuedThreadPool;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.Collections;
 
 @Configuration
-@ConditionalOnClass(name = {
-    "org.eclipse.jetty.server.Server",
-    "org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory"
-})
+@ConditionalOnClass(name = "org.eclipse.jetty.server.Server")
+@ConditionalOnMissingClass("org.apache.catalina.startup.Tomcat")
 public class JettyMetricsConfiguration {
 
     @Bean