Skip to content

Commit

Permalink
Fixes accidental exclude of brave and makes classic more explicit
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Cole committed Oct 20, 2019
1 parent 32a3e69 commit 434964e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions zipkin-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@
<classifier>slim</classifier>
<!-- https://github.com/spring-projects/spring-boot/issues/3426 transitive exclude doesn't work -->
<excludeGroupIds>
io.zipkin.java,com.google.auto.value,com.google.guava,io.dropwizard.metrics,com.datastax.cassandra,com.github.jnr,org.ow2.asm,org.jooq,javax.xml.bind,org.mariadb.jdbc,com.zaxxer,org.apache.activemq,org.apache.geronimo.specs,org.fusesource.hawtbuf,org.apache.kafka,com.github.luben,org.lz4,org.xerial.snappy,com.rabbitmq,jakarta.annotation,org.apache.thrift,org.apache.logging.log4j
com.google.auto.value,com.google.guava,io.dropwizard.metrics,com.datastax.cassandra,com.github.jnr,org.ow2.asm,org.jooq,javax.xml.bind,org.mariadb.jdbc,com.zaxxer,org.apache.activemq,org.apache.geronimo.specs,org.fusesource.hawtbuf,org.apache.kafka,com.github.luben,org.lz4,org.xerial.snappy,com.rabbitmq,jakarta.annotation,org.apache.thrift,org.apache.logging.log4j
</excludeGroupIds>
<excludes>
<!-- Actuator -->
Expand All @@ -538,12 +538,6 @@
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<!-- Brave -->
<dependency>
<groupId>${armeria.groupId}</groupId>
<artifactId>armeria-brave</artifactId>
</dependency>

<!-- Log4J 2 -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -573,6 +567,12 @@
<!-- <artifactId>LatencyUtils</artifactId>-->
<!-- </dependency>-->

<!-- Static content for the Classic UI -->
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-ui</artifactId>
</dependency>

<!-- storage and collectors which have 3rd party deps -->
<dependency>
<groupId>${project.groupId}.zipkin2</groupId>
Expand Down

0 comments on commit 434964e

Please sign in to comment.