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/06/16 02:45:38 UTC
[incubator-zipkin] branch master updated: Updates zipkin versions
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 3e6949f Updates zipkin versions
3e6949f is described below
commit 3e6949f372c813379c2e6ed5b35448879049cdce
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Sun Jun 16 10:45:14 2019 +0800
Updates zipkin versions
---
pom.xml | 4 ++--
zipkin-server/pom.xml | 2 +-
.../test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java | 2 +-
.../src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java | 2 +-
.../zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java | 2 +-
.../zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java | 2 +-
.../src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6dcf814..7fb5d9a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -49,14 +49,14 @@
<main.basedir>${project.basedir}</main.basedir>
<armeria.version>0.87.0</armeria.version>
- <!-- This is from armeria, but be careful to avoid >= v20 apis -->
+ <!-- This should only be used in tests, and be careful to avoid >= v20 apis -->
<guava.version>27.1-jre</guava.version>
<!-- only used for proto interop testing -->
<wire.version>3.0.0-alpha01</wire.version>
<unpack-proto.directory>${project.build.directory}/test/proto</unpack-proto.directory>
- <brave.version>5.6.3</brave.version>
+ <brave.version>5.6.5</brave.version>
<cassandra-driver-core.version>3.7.1</cassandra-driver-core.version>
<okhttp.version>3.14.2</okhttp.version>
<okio.version>1.17.4</okio.version>
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
index ed42061..da52b65 100644
--- a/zipkin-server/pom.xml
+++ b/zipkin-server/pom.xml
@@ -283,7 +283,7 @@
<dependency>
<groupId>io.zipkin.brave.cassandra</groupId>
<artifactId>brave-instrumentation-cassandra-driver</artifactId>
- <version>0.10.2</version>
+ <version>0.10.3</version>
<optional>true</optional>
</dependency>
diff --git a/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java b/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java
index e55a1e7..bdc85ca 100644
--- a/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java
+++ b/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java
@@ -48,7 +48,7 @@ import static zipkin2.storage.cassandra.v1.InternalForTests.writeDependencyLinks
public class ITCassandraStorage {
static CassandraStorageRule classRule() {
- return new CassandraStorageRule("openzipkin/zipkin-cassandra:2.13.0", "test_cassandra3");
+ return new CassandraStorageRule("openzipkin/zipkin-cassandra:2.14.2", "test_cassandra3");
}
public static class ITSpanStore extends zipkin2.storage.ITSpanStore {
diff --git a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java
index 8cf20b1..38511fa 100644
--- a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java
+++ b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java
@@ -49,7 +49,7 @@ import static zipkin2.storage.cassandra.InternalForTests.writeDependencyLinks;
public class ITCassandraStorage {
static CassandraStorageRule classRule() {
- return new CassandraStorageRule("openzipkin/zipkin-cassandra:2.13.0", "test_cassandra3");
+ return new CassandraStorageRule("openzipkin/zipkin-cassandra:2.14.2", "test_cassandra3");
}
public static class ITSpanStore extends zipkin2.storage.ITSpanStore {
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
index 5a7d36d..9978aa6 100644
--- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
+++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
@@ -34,7 +34,7 @@ import static zipkin2.elasticsearch.integration.ElasticsearchStorageRule.index;
public class ITElasticsearchStorageV6 {
static ElasticsearchStorageRule classRule() {
- return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch6:2.13.0",
+ return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch6:2.14.2",
"test_elasticsearch3");
}
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java
index a706ed6..f54e77d 100644
--- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java
+++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java
@@ -32,7 +32,7 @@ import static zipkin2.elasticsearch.integration.ElasticsearchStorageRule.index;
public class ITElasticsearchStorageV7 {
static ElasticsearchStorageRule classRule() {
- return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch7:2.13.0",
+ return new ElasticsearchStorageRule("openzipkin/zipkin-elasticsearch7:2.14.2",
"test_elasticsearch3");
}
diff --git a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java
index 0bf7045..8b38230 100644
--- a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java
+++ b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java
@@ -34,7 +34,7 @@ import static zipkin2.storage.mysql.v1.internal.generated.tables.ZipkinDependenc
public class ITMySQLStorage {
static LazyMySQLStorage classRule() {
- return new LazyMySQLStorage("openzipkin/zipkin-mysql:2.13.0");
+ return new LazyMySQLStorage("openzipkin/zipkin-mysql:2.14.2");
}
public static class ITSpanStore extends zipkin2.storage.ITSpanStore {