zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin] branch master updated: Tries to fix jenkins
Date Fri, 10 May 2019 10:05:31 GMT
This is an automated email from the ASF dual-hosted git repository.

adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git


The following commit(s) were added to refs/heads/master by this push:
     new 2539a77  Tries to fix jenkins
2539a77 is described below

commit 2539a77fee84d925f6f52d80c3fb850620db1cc9
Author: Adrian Cole <acole@pivotal.io>
AuthorDate: Fri May 10 18:05:21 2019 +0800

    Tries to fix jenkins
---
 zipkin-collector/scribe/pom.xml | 7 +++++++
 zipkin-server/pom.xml           | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/zipkin-collector/scribe/pom.xml b/zipkin-collector/scribe/pom.xml
index 178323f..286454b 100644
--- a/zipkin-collector/scribe/pom.xml
+++ b/zipkin-collector/scribe/pom.xml
@@ -49,6 +49,13 @@
       <version>${armeria.version}</version>
     </dependency>
 
+    <!-- for Generated annotations on Scribe types -->
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.linecorp.armeria</groupId>
       <artifactId>armeria-testing</artifactId>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index 99bd090..b8693e9 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -250,12 +250,6 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
-    <!-- for Generated annotations on Scribe types -->
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <!--Prometheus metrics-->
     <dependency>


Mime
View raw message