Merge pull request #261 from jbonofre/KARAF-7212
[KARAF-7212] Upgrade to kafka 2.8.0
diff --git a/appender/kafka/pom.xml b/appender/kafka/pom.xml
index f2dc788..f935978 100644
--- a/appender/kafka/pom.xml
+++ b/appender/kafka/pom.xml
@@ -82,9 +82,11 @@
<Export-Package>!*</Export-Package>
<Import-Package>
!org.apache.kafka*,
+ !org.xerial.snappy*,
!net.jpountz*,
!com.fasterxml.jackson*,
!kafka,
+ com.github.luben.zstd;resolution:=optional,
com.ibm.security.krb5*;resolution:=optional,
sun.security.krb5;resolution:=optional,
*
@@ -93,6 +95,7 @@
org.apache.karaf.decanter.appender.kafka,
org.apache.karaf.decanter.appender.utils,
org.apache.kafka*,
+ org.xerial.snappy*,
net.jpountz*,
com.fasterxml.jackson*,
kafka
@@ -124,4 +127,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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 15537d9..414fd2d 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
@@ -71,8 +71,7 @@
private KafkaServer startBroker(Properties props) {
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);
+ KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty(), true);
server.startup();
return server;
}
diff --git a/collector/kafka/pom.xml b/collector/kafka/pom.xml
index dfbae00..8e6ae53 100644
--- a/collector/kafka/pom.xml
+++ b/collector/kafka/pom.xml
@@ -68,9 +68,11 @@
<Export-Package>!*</Export-Package>
<Import-Package>
!org.apache.kafka*,
+ !org.xerial.snappy*,
!com.fasterxml.jackson*,
!net.jpountz*,
!kafka;
+ com.github.luben.zstd;resolution:=optional,
com.ibm.security.krb5*;resolution:=optional,
sun.security.krb5;resolution:=optional,
*
@@ -79,6 +81,7 @@
org.apache.karaf.decanter.collector.kafka,
org.apache.karaf.decanter.collector.utils,
org.apache.kafka*,
+ org.xerial.snappy*,
com.fasterxml.jackson*,
net.jpountz*,
kafka
diff --git a/pom.xml b/pom.xml
index bfd4708..ca76cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<cassandra.driver.version>4.9.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.7.0</kafka.version>
+ <kafka.version>2.8.0</kafka.version>
<karaf.version>4.2.10</karaf.version>
<kibana.version>3.1.1</kibana.version>
<kibana4.version>4.1.2</kibana4.version>
