verifies line/armeria#2107

openzipkin · Sep 24, 2019 · 54ff973 · 54ff973
1 parent 9b62a98
commit 54ff973
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,8 +48,8 @@
     <main.basedir>${project.basedir}</main.basedir>
 
     <!-- This allows you to test feature branches with jitpack -->
-    <armeria.groupId>com.linecorp.armeria</armeria.groupId>
-    <armeria.version>0.92.0</armeria.version>
+    <armeria.groupId>com.github.trustin.armeria</armeria.groupId>
+    <armeria.version>spring_boot_optional_dropwizard-SNAPSHOT</armeria.version>
     <!-- This should only be used in tests, and be careful to avoid >= v20 apis -->
     <guava.version>28.0-jre</guava.version>
 
@@ -110,6 +110,13 @@
     <url>http://zipkin.io/</url>
   </organization>
 
+  <repositories>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>

diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
@@ -466,14 +466,13 @@
             <configuration>
               <classifier>slim</classifier>
               <!-- https://github.com/spring-projects/spring-boot/issues/3426 transitive exclude doesn't work -->
-              <!-- TODO: exclude io.dropwizard.metrics after https://github.com/line/armeria/issues/2106 -->
               <excludeGroupIds>
-                io.zipkin.java,com.google.auto.value,com.google.guava,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,
+                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,
               </excludeGroupIds>
               <excludes>
                 <!-- Actuator -->
                 <dependency>
-                  <groupId>com.linecorp.armeria</groupId>
+                  <groupId>${armeria.groupId}</groupId>
                   <artifactId>armeria-spring-boot-actuator-autoconfigure</artifactId>
                 </dependency>
                 <dependency>
@@ -500,13 +499,13 @@
                 </dependency>
 
                 <!-- Unnecessary micrometer deps -->
-                <dependency>
-                  <!-- only used by TimeWindowPercentileHistogram -->
-                  <groupId>org.hdrhistogram</groupId>
-                  <artifactId>HdrHistogram</artifactId>
-                </dependency>
                 <!-- TODO: https://github.com/micrometer-metrics/micrometer/issues/1599 -->
 <!--                <dependency>-->
+<!--                  &lt;!&ndash; only used by TimeWindowPercentileHistogram &ndash;&gt;-->
+<!--                  <groupId>org.hdrhistogram</groupId>-->
+<!--                  <artifactId>HdrHistogram</artifactId>-->
+<!--                </dependency>-->
+<!--                <dependency>-->
 <!--                  &lt;!&ndash; we don't use pause detector &ndash;&gt;-->
 <!--                  <groupId>org.latencyutils</groupId>-->
 <!--                  <artifactId>LatencyUtils</artifactId>-->
@@ -556,7 +555,7 @@
                   <artifactId>zipkin-collector-rabbitmq</artifactId>
                 </dependency>
                 <exclude>
-                  <groupId>com.linecorp.armeria</groupId>
+                  <groupId>${armeria.groupId}</groupId>
                   <artifactId>armeria-thrift</artifactId>
                 </exclude>
               </excludes>