You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/05/10 13:34:47 UTC
[incubator-zipkin-reporter-java] branch asf-zipkin created (now
e3152c6)
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a change to branch asf-zipkin
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-reporter-java.git.
at e3152c6 Moves to ASF zipkin dependencies
This branch includes the following new commits:
new e3152c6 Moves to ASF zipkin dependencies
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-zipkin-reporter-java] 01/01: Moves to ASF zipkin
dependencies
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch asf-zipkin
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-reporter-java.git
commit e3152c6c838bbceb8a6197ebae1775f38455bd09
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Fri May 10 21:34:31 2019 +0800
Moves to ASF zipkin dependencies
---
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 @@
<properties>
<main.basedir>${project.basedir}/..</main.basedir>
<!-- use the same value in ../pom.xml -->
- <zipkin.version>2.12.7</zipkin.version>
+ <zipkin.version>2.13.0</zipkin.version>
</properties>
<url>https://github.com/apache/incubator-zipkin-reporter-java</url>
@@ -71,13 +71,13 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>io.zipkin.zipkin2</groupId>
+ <groupId>org.apache.zipkin.zipkin2</groupId>
<artifactId>zipkin</artifactId>
<version>${zipkin.version}</version>
</dependency>
<!-- Also set version of the JUnit rule that tests reporters -->
<dependency>
- <groupId>io.zipkin.zipkin2</groupId>
+ <groupId>org.apache.zipkin.zipkin2</groupId>
<artifactId>zipkin-junit</artifactId>
<version>${zipkin.version}</version>
</dependency>
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<S> extends Component implements Reporter<S>, Flushable {
/**
- * Builds a json reporter for <a href="http://zipkin.io/zipkin-api/#/">Zipkin V2</a>. If http,
+ * Builds a json reporter for <a href="https://zipkin.apache.org/zipkin-api/#/">Zipkin V2</a>. If http,
* the endpoint of the sender is usually "http://zipkinhost:9411/api/v2/spans".
*
* <p>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 @@
</dependency>
<dependency>
- <groupId>io.zipkin.zipkin2</groupId>
+ <groupId>org.apache.zipkin.zipkin2</groupId>
<artifactId>zipkin-collector-scribe</artifactId>
<version>${zipkin.version}</version>
<scope>test</scope>
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 <a href="http://zipkin.io/zipkin-api/#/">POST</a> endpoint.
+ * Reports spans to Zipkin, using its <a href="https://zipkin.apache.org/zipkin-api/#/">POST</a> endpoint.
*
* <p>This sender is thread-safe.
*/
@@ -78,7 +78,7 @@ public final class OkHttpSender extends Sender {
}
/**
- * No default. The POST URL for zipkin's <a href="http://zipkin.io/zipkin-api/#/">v2 api</a>,
+ * No default. The POST URL for zipkin's <a href="https://zipkin.apache.org/zipkin-api/#/">v2 api</a>,
* 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 @@
<errorprone.args />
<!-- use the same value in bom/pom.xml -->
- <zipkin.version>2.12.7</zipkin.version>
+ <zipkin.version>2.13.0</zipkin.version>
<license-maven-plugin.version>3.0</license-maven-plugin.version>
</properties>
@@ -162,7 +162,7 @@
<dependencies>
<dependency>
- <groupId>io.zipkin.zipkin2</groupId>
+ <groupId>org.apache.zipkin.zipkin2</groupId>
<artifactId>zipkin</artifactId>
<version>${zipkin.version}</version>
</dependency>
@@ -228,13 +228,13 @@
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
- <include>io.zipkin.zipkin2:zipkin</include>
+ <include>org.apache.zipkin.zipkin2:zipkin</include>
</includes>
</artifactSet>
<filters>
<filter>
<!-- Shade references to classes packages -->
- <artifact>io.zipkin.zipkin2:zipkin</artifact>
+ <artifact>org.apache.zipkin.zipkin2:zipkin</artifact>
<includes>
<include>zipkin2/internal/Platform*.class</include>
</includes>
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 <a href="http://zipkin.io/zipkin-api/#/">POST</a> endpoint.
+ * Reports spans to Zipkin, using its <a href="https://zipkin.apache.org/zipkin-api/#/">POST</a> endpoint.
*
* <p>This sender is thread-safe.
*/
@@ -63,7 +63,7 @@ public final class URLConnectionSender extends Sender {
}
/**
- * No default. The POST URL for zipkin's <a href="http://zipkin.io/zipkin-api/#/">v2 api</a>,
+ * No default. The POST URL for zipkin's <a href="https://zipkin.apache.org/zipkin-api/#/">v2 api</a>,
* usually "http://zipkinhost:9411/api/v2/spans"
*/
// customizable so that users can re-map /api/v2/spans ex for browser-originated traces