From commits-return-1147-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org Fri May 10 14:24:56 2019 Return-Path: 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 C07DC18061A for ; Fri, 10 May 2019 16:24:55 +0200 (CEST) Received: (qmail 90014 invoked by uid 500); 10 May 2019 14:24:55 -0000 Mailing-List: contact commits-help@zipkin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zipkin.apache.org Delivered-To: mailing list commits@zipkin.apache.org Received: (qmail 90003 invoked by uid 99); 10 May 2019 14:24:55 -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 14:24:55 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C19A3872F9; Fri, 10 May 2019 14:24:54 +0000 (UTC) Date: Fri, 10 May 2019 14:24:54 +0000 To: "commits@zipkin.apache.org" Subject: [incubator-zipkin-reporter-java] branch master updated: Moves to ASF zipkin dependencies (#144) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155749829473.9055.2996181122241908857@gitbox.apache.org> From: adriancole@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-zipkin-reporter-java X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5347a35e0389aeee94d0c2f591880ee0abd59182 X-Git-Newrev: 2c502034628b7583a051a59196b6dc7d4334ff6d X-Git-Rev: 2c502034628b7583a051a59196b6dc7d4334ff6d 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-reporter-java.git The following commit(s) were added to refs/heads/master by this push: new 2c50203 Moves to ASF zipkin dependencies (#144) 2c50203 is described below commit 2c502034628b7583a051a59196b6dc7d4334ff6d Author: Adrian Cole AuthorDate: Fri May 10 22:24:50 2019 +0800 Moves to ASF zipkin dependencies (#144) --- bom/pom.xml | 6 +++--- core/src/main/java/zipkin2/reporter/AsyncReporter.java | 2 +- libthrift/pom.xml | 2 +- okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java | 4 ++-- pom.xml | 8 ++++---- .../java/zipkin2/reporter/urlconnection/URLConnectionSender.java | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 2abc692..df3762e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,7 +17,7 @@ ${project.basedir}/.. - 2.12.7 + 2.13.0 https://github.com/apache/incubator-zipkin-reporter-java @@ -71,13 +71,13 @@ - io.zipkin.zipkin2 + org.apache.zipkin.zipkin2 zipkin ${zipkin.version} - io.zipkin.zipkin2 + org.apache.zipkin.zipkin2 zipkin-junit ${zipkin.version} diff --git a/core/src/main/java/zipkin2/reporter/AsyncReporter.java b/core/src/main/java/zipkin2/reporter/AsyncReporter.java index b75c2be..c7b7775 100644 --- a/core/src/main/java/zipkin2/reporter/AsyncReporter.java +++ b/core/src/main/java/zipkin2/reporter/AsyncReporter.java @@ -52,7 +52,7 @@ import static java.util.logging.Level.FINE; */ public abstract class AsyncReporter extends Component implements Reporter, Flushable { /** - * Builds a json reporter for Zipkin V2. If http, + * Builds a json reporter for Zipkin V2. If http, * the endpoint of the sender is usually "http://zipkinhost:9411/api/v2/spans". * *

After a certain threshold, spans are drained and {@link Sender#sendSpans(List) sent} to diff --git a/libthrift/pom.xml b/libthrift/pom.xml index bc05bca..41672f9 100644 --- a/libthrift/pom.xml +++ b/libthrift/pom.xml @@ -53,7 +53,7 @@ - io.zipkin.zipkin2 + org.apache.zipkin.zipkin2 zipkin-collector-scribe ${zipkin.version} test diff --git a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java index ec771c6..c53fe1e 100644 --- a/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java +++ b/okhttp3/src/main/java/zipkin2/reporter/okhttp3/OkHttpSender.java @@ -41,7 +41,7 @@ import zipkin2.reporter.Sender; import static java.util.concurrent.TimeUnit.MILLISECONDS; /** - * Reports spans to Zipkin, using its POST endpoint. + * Reports spans to Zipkin, using its POST endpoint. * *

This sender is thread-safe. */ @@ -78,7 +78,7 @@ public final class OkHttpSender extends Sender { } /** - * No default. The POST URL for zipkin's v2 api, + * No default. The POST URL for zipkin's v2 api, * usually "http://zipkinhost:9411/api/v2/spans" */ // customizable so that users can re-map /api/v2/spans ex for browser-originated traces diff --git a/pom.xml b/pom.xml index 7b73ef7..360479d 100755 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ - 2.12.7 + 2.13.0 3.0 @@ -162,7 +162,7 @@ - io.zipkin.zipkin2 + org.apache.zipkin.zipkin2 zipkin ${zipkin.version} @@ -228,13 +228,13 @@ false - io.zipkin.zipkin2:zipkin + org.apache.zipkin.zipkin2:zipkin - io.zipkin.zipkin2:zipkin + org.apache.zipkin.zipkin2:zipkin zipkin2/internal/Platform*.class diff --git a/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java b/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java index 3e24e35..4e51dab 100644 --- a/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java +++ b/urlconnection/src/main/java/zipkin2/reporter/urlconnection/URLConnectionSender.java @@ -32,7 +32,7 @@ import zipkin2.reporter.BytesMessageEncoder; import zipkin2.reporter.Sender; /** - * Reports spans to Zipkin, using its POST endpoint. + * Reports spans to Zipkin, using its POST endpoint. * *

This sender is thread-safe. */ @@ -63,7 +63,7 @@ public final class URLConnectionSender extends Sender { } /** - * No default. The POST URL for zipkin's v2 api, + * No default. The POST URL for zipkin's v2 api, * usually "http://zipkinhost:9411/api/v2/spans" */ // customizable so that users can re-map /api/v2/spans ex for browser-originated traces