From commits-return-1121-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org  Fri May 10 10:05:32 2019
Return-Path: <commits-return-1121-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [207.244.88.153])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 62B3F18061A
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 10 May 2019 12:05:32 +0200 (CEST)
Received: (qmail 83471 invoked by uid 500); 10 May 2019 10:05:31 -0000
Mailing-List: contact commits-help@zipkin.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zipkin.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zipkin.apache.org>
List-Post: <mailto:commits@zipkin.apache.org>
List-Id: <commits.zipkin.apache.org>
Reply-To: dev@zipkin.apache.org
Delivered-To: mailing list commits@zipkin.apache.org
Received: (qmail 83462 invoked by uid 99); 10 May 2019 10:05:31 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 May 2019 10:05:31 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id 4023B872E9; Fri, 10 May 2019 10:05:31 +0000 (UTC)
Date: Fri, 10 May 2019 10:05:31 +0000
To: "commits@zipkin.apache.org" <commits@zipkin.apache.org>
Subject: [incubator-zipkin] branch master updated: Tries to fix jenkins
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <155748273111.14992.641477557976198635@gitbox.apache.org>
From: adriancole@apache.org
X-Git-Host: gitbox.apache.org
X-Git-Repo: incubator-zipkin
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7f800e4eff16c9646ea5acf8aea27ad0456c1f0e
X-Git-Newrev: 2539a77fee84d925f6f52d80c3fb850620db1cc9
X-Git-Rev: 2539a77fee84d925f6f52d80c3fb850620db1cc9
X-Git-NotificationType: ref_changed_plus_diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated

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>