You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/03/13 16:52:09 UTC
[karaf-decanter] branch master updated: [KARAF-6488] Upgrade to
kafka 2.4.1
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/master by this push:
new f068919 [KARAF-6488] Upgrade to kafka 2.4.1
new 7089c46 Merge pull request #135 from jbonofre/KARAF-6488
f068919 is described below
commit f0689190ab5336e7d78cab2dfd95968f03839a0b
Author: jbonofre <jb...@apache.org>
AuthorDate: Fri Mar 13 07:36:32 2020 +0100
[KARAF-6488] Upgrade to kafka 2.4.1
---
appender/kafka/pom.xml | 34 ++++++++--------------
.../appender/kafka/EmbeddedKafkaBroker.java | 7 -----
.../decanter/appender/kafka/KafkaAppenderTest.java | 3 +-
assembly/src/main/feature/feature.xml | 2 --
collector/kafka/pom.xml | 10 ++++++-
pom.xml | 2 +-
6 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/appender/kafka/pom.xml b/appender/kafka/pom.xml
index 970aa10..792b216 100644
--- a/appender/kafka/pom.xml
+++ b/appender/kafka/pom.xml
@@ -60,26 +60,6 @@
<artifactId>kafka_2.11</artifactId>
<version>${kafka.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.25</version>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -95,10 +75,20 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>!*</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ !org.apache.kafka*,
+ !com.fasterxml.jackson*,
+ !net.jpountz*,
+ com.ibm.security.krb5.internal;resolution:=optional,
+ sun.security.krb5;resolution:=optional,
+ *
+ </Import-Package>
<Private-Package>
org.apache.karaf.decanter.appender.kafka,
- org.apache.karaf.decanter.appender.utils
+ org.apache.karaf.decanter.appender.utils,
+ org.apache.kafka*,
+ com.fasterxml.jackson*,
+ net.jpountz*
</Private-Package>
<_dsannotations>*</_dsannotations>
</instructions>
diff --git a/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java
index 4de295a..15537d9 100644
--- a/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java
+++ b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/EmbeddedKafkaBroker.java
@@ -19,7 +19,6 @@ package org.apache.karaf.decanter.appender.kafka;
import kafka.metrics.KafkaMetricsReporter;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServer;
-import kafka.utils.ZkUtils;
import org.apache.kafka.common.utils.SystemTime;
import org.junit.rules.ExternalResource;
import scala.Option;
@@ -41,7 +40,6 @@ public class EmbeddedKafkaBroker extends ExternalResource {
private KafkaServer kafkaServer;
private File logDir;
- private ZkUtils zkUtils;
public EmbeddedKafkaBroker(int brokerId, int port, String zkConnection, Properties baseProperties) {
this.brokerId = brokerId;
@@ -72,11 +70,6 @@ public class EmbeddedKafkaBroker extends ExternalResource {
}
private KafkaServer startBroker(Properties props) {
- zkUtils = ZkUtils.apply(
- zkConnection,
- 30000,
- 30000,
- false);
List<KafkaMetricsReporter> kmrList = new ArrayList<>();
Buffer<KafkaMetricsReporter> metricsList = scala.collection.JavaConversions.asScalaBuffer(kmrList);
KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty(), metricsList);
diff --git a/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/KafkaAppenderTest.java b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/KafkaAppenderTest.java
index 7172502..c17c0c3 100644
--- a/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/KafkaAppenderTest.java
+++ b/appender/kafka/src/test/java/org/apache/karaf/decanter/appender/kafka/KafkaAppenderTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.karaf.decanter.appender.kafka;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.serialization.StringDeserializer;
import org.junit.*;
import org.osgi.service.event.Event;
import org.slf4j.Logger;
@@ -63,6 +63,7 @@ public class KafkaAppenderTest {
Properties kafkaConfig = new Properties();
kafkaConfig.put("topic", "test");
kafkaConfig.put("bootstrap.servers", kafkaBroker.getBrokerList());
+ kafkaConfig.put("key.deserializer", new StringDeserializer());
KafkaConsumer consumer = new KafkaConsumer<String, String>(kafkaConfig);
consumer.subscribe(Arrays.asList("test"));
ConsumerRecords<String, String> records = consumer.poll(1000);
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 67bcbf8..31e3caf 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -139,7 +139,6 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-collector-kafka-core" version="${project.version}" description="Karaf Decanter Kafka Collector core">
<feature>decanter-common</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/2.1.1_2</bundle>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.kafka/${project.version}</bundle>
</feature>
@@ -263,7 +262,6 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-kafka-core" version="${project.version}" description="Karaf Decanter Kafka Appender core">
<feature>decanter-common</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/2.1.1_2</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.kafka/${project.version}</bundle>
</feature>
diff --git a/collector/kafka/pom.xml b/collector/kafka/pom.xml
index 007268e..7e16a6c 100644
--- a/collector/kafka/pom.xml
+++ b/collector/kafka/pom.xml
@@ -62,11 +62,19 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>!*</Export-Package>
<Import-Package>
+ !org.apache.kafka*,
+ !com.fasterxml.jackson*,
+ !net.jpountz*,
+ com.ibm.security.krb5.internal;resolution:=optional,
+ sun.security.krb5;resolution:=optional,
*
</Import-Package>
<Private-Package>
org.apache.karaf.decanter.collector.kafka,
- org.apache.karaf.decanter.collector.utils
+ org.apache.karaf.decanter.collector.utils,
+ org.apache.kafka*,
+ com.fasterxml.jackson*,
+ net.jpountz*
</Private-Package>
<_dsannotations>*</_dsannotations>
</instructions>
diff --git a/pom.xml b/pom.xml
index 7aeb2f8..f996b4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<cassandra.driver.version>4.1.0</cassandra.driver.version>
<glassfish-json.version>1.1.4</glassfish-json.version>
<json-api.version>1.1.4</json-api.version>
- <kafka.version>2.1.1</kafka.version>
+ <kafka.version>2.4.1</kafka.version>
<karaf.version>4.2.8</karaf.version>
<kibana.version>3.1.1</kibana.version>
<kibana4.version>4.1.2</kibana4.version>