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/15 12:06:24 UTC
[incubator-zipkin] branch master updated: Updates and ASF glitches
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 1867262 Updates and ASF glitches
1867262 is described below
commit 18672623fd49ed20d439ca0c2ecbae788401a22c
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Wed May 15 14:00:05 2019 +0200
Updates and ASF glitches
---
README.md | 6 +++---
zipkin-server/pom.xml | 4 ++--
zipkin-storage/mysql-v1/pom.xml | 13 -------------
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index 14d4fe2..7d87391 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ If your applications aren't sending traces, yet, configure them with [Zipkin ins
Check out the [`zipkin-server`](/zipkin-server) documentation for configuration details, or [`docker-zipkin`](https://github.com/openzipkin/docker-zipkin) for how to use docker-compose.
## Core Library
-The [core library](zipkin2/src/main/java/zipkin2) is used by both Zipkin instrumentation and the Zipkin server. Its minimum Java language level is 6, in efforts to support those writing agent instrumentation.
+The [core library](zipkin/src/main/java/zipkin2) is used by both Zipkin instrumentation and the Zipkin server. Its minimum Java language level is 6, in efforts to support those writing agent instrumentation.
This includes built-in codec for Zipkin's v1 and v2 json formats. A direct dependency on gson (json library) is avoided by minifying and repackaging classes used. The result is a 155k jar which won't conflict with any library you use.
@@ -74,7 +74,7 @@ storage.close();
```
### In-Memory
-The [InMemoryStorage](zipkin2/src/main/java/zipkin2/storage/InMemoryStorage.java) component is packaged in zipkin's core library. It
+The [InMemoryStorage](zipkin/src/main/java/zipkin2/storage/InMemoryStorage.java) component is packaged in zipkin's core library. It
is neither persistent, nor viable for realistic work loads. Its purpose
is for testing, for example starting a server on your laptop without any
database needed.
@@ -152,7 +152,7 @@ $ java -jar ./zipkin-server/target/zipkin-server-*exec.jar
Server artifacts are under the maven group id `org.apache.zipkin`
Library artifacts are under the maven group id `org.apache.zipkin.zipkin2`
### Source Releases
-Source Releases are uploaded to [Apache](https://dist.apache.org/repos/dist/release/incubator/zipkin/zipkin)
+Source Releases are uploaded to [Apache](https://www.apache.org/dyn/closer.lua/incubator/zipkin/zipkin)
### Binary Releases
Binary Releases are uploaded to [Apache](https://repository.apache.org/service/local/staging/deploy/maven2) and synchronized to [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.zipkin%22)
### Binary Snapshots
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index 514e6e6..bb8f33f 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -128,7 +128,7 @@
<!-- HTML library for injecting configurable <base> tag -->
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.11.3</version>
+ <version>1.12.1</version>
</dependency>
<!-- to test the experimental grpc endpoint with the square/wire library -->
@@ -261,7 +261,7 @@
<dependency>
<groupId>com.netflix.concurrency-limits</groupId>
<artifactId>concurrency-limits-core</artifactId>
- <version>0.2.2</version>
+ <version>0.3.0</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml
index ebd915f..f653723 100644
--- a/zipkin-storage/mysql-v1/pom.xml
+++ b/zipkin-storage/mysql-v1/pom.xml
@@ -74,19 +74,6 @@
<artifactId>mysql</artifactId>
<scope>test</scope>
</dependency>
- <!-- https://github.com/testcontainers/testcontainers-java/issues/1342 -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.5</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>