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/20 13:43:27 UTC
[incubator-zipkin-reporter-java] 01/01: Deprecates Kafka 0.8 and
promotes kafka11 as kafka
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch deprecate-kafka08
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-reporter-java.git
commit ceca52ac6f7ed11e0e9ecd2865d0ace1a2e96ded
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Mon May 20 15:42:59 2019 +0200
Deprecates Kafka 0.8 and promotes kafka11 as kafka
---
benchmarks/pom.xml | 2 +-
bom/pom.xml | 2 +-
{kafka11 => kafka}/pom.xml | 4 ++--
.../src/main/java/zipkin2/reporter/kafka11/KafkaSender.java | 0
.../src/test/java/zipkin2/reporter/kafka11/ITKafkaSender.java | 0
{kafka11 => kafka}/src/test/resources/logback.xml | 0
kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java | 3 ++-
pom.xml | 2 +-
spring-beans/README.md | 2 +-
spring-beans/pom.xml | 2 +-
10 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index c33fe15..f5b08e4 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>zipkin-sender-kafka11</artifactId>
+ <artifactId>zipkin-sender-kafka</artifactId>
</dependency>
<dependency>
diff --git a/bom/pom.xml b/bom/pom.xml
index c2e43dd..8f2cad5 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -128,7 +128,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>zipkin-sender-kafka11</artifactId>
+ <artifactId>zipkin-sender-kafka</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/kafka11/pom.xml b/kafka/pom.xml
similarity index 95%
rename from kafka11/pom.xml
rename to kafka/pom.xml
index f76f413..13dc924 100644
--- a/kafka11/pom.xml
+++ b/kafka/pom.xml
@@ -26,7 +26,7 @@
<version>2.8.3-SNAPSHOT</version>
</parent>
- <artifactId>zipkin-sender-kafka11</artifactId>
+ <artifactId>zipkin-sender-kafka</artifactId>
<name>Zipkin Sender: Kafka 0.11+</name>
<properties>
@@ -73,7 +73,7 @@
<configuration>
<archive>
<manifestEntries>
- <Automatic-Module-Name>zipkin2.reporter.kafka11</Automatic-Module-Name>
+ <Automatic-Module-Name>zipkin2.reporter.kafka</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
diff --git a/kafka11/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java b/kafka/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java
similarity index 100%
rename from kafka11/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java
rename to kafka/src/main/java/zipkin2/reporter/kafka11/KafkaSender.java
diff --git a/kafka11/src/test/java/zipkin2/reporter/kafka11/ITKafkaSender.java b/kafka/src/test/java/zipkin2/reporter/kafka11/ITKafkaSender.java
similarity index 100%
rename from kafka11/src/test/java/zipkin2/reporter/kafka11/ITKafkaSender.java
rename to kafka/src/test/java/zipkin2/reporter/kafka11/ITKafkaSender.java
diff --git a/kafka11/src/test/resources/logback.xml b/kafka/src/test/resources/logback.xml
similarity index 100%
rename from kafka11/src/test/resources/logback.xml
rename to kafka/src/test/resources/logback.xml
diff --git a/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java b/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java
index e25b53e..1f03320 100644
--- a/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java
+++ b/kafka08/src/main/java/zipkin2/reporter/kafka08/KafkaSender.java
@@ -37,8 +37,9 @@ import zipkin2.reporter.Sender;
*
* <p>This sender is thread-safe.
*
- * <p>This sender remains a Kafka 0.8.x consumer, while Zipkin systems update to 0.9+.
+ * @deprecated Please use org.apache.zipkin.reporter2:zipkin-sender-kafka
*/
+@Deprecated
public final class KafkaSender extends Sender {
/** Creates a sender that sends {@link Encoding#JSON} messages. */
diff --git a/pom.xml b/pom.xml
index cbe2ad4..e95d6d5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,8 @@
<modules>
<module>bom</module>
<module>core</module>
+ <module>kafka</module>
<module>kafka08</module>
- <module>kafka11</module>
<module>amqp-client</module>
<module>urlconnection</module>
<module>okhttp3</module>
diff --git a/spring-beans/README.md b/spring-beans/README.md
index 5735cd8..87fbb34 100644
--- a/spring-beans/README.md
+++ b/spring-beans/README.md
@@ -6,7 +6,7 @@ tracing with only XML. Notably, this requires minimally Spring version 2.5.
Bean Factories exist for the following types:
* AsyncReporterFactoryBean - for configuring how often spans are sent to Zipkin
* OkHttpSenderFactoryBean - for [zipkin-sender-okhttp3](../okhttp3)
-* KafkaSenderFactoryBean - for [zipkin-sender-kafka11](../kafka11)
+* KafkaSenderFactoryBean - for [zipkin-sender-kafka](../kafka11)
* RabbitMQSenderFactoryBean - for [zipkin-sender-amqp-client](../amqp-client)
* URLConnectionSenderFactoryBean - for [zipkin-sender-urlconnection](../urlconnection)
diff --git a/spring-beans/pom.xml b/spring-beans/pom.xml
index 6063f66..a9d536d 100644
--- a/spring-beans/pom.xml
+++ b/spring-beans/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>zipkin-sender-kafka11</artifactId>
+ <artifactId>zipkin-sender-kafka</artifactId>
<scope>provided</scope>
</dependency>
<dependency>