Merge pull request #261 from jbonofre/KARAF-7212
[KARAF-7212] Upgrade to kafka 2.8.0
diff --git a/appender/hdfs/pom.xml b/appender/hdfs/pom.xml
index 2df7ff0..c4b7be5 100644
--- a/appender/hdfs/pom.xml
+++ b/appender/hdfs/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
@@ -94,6 +94,7 @@
!jdiff,
!net.jcip*,
!net.minidev*,
+ !net.jpountz.lz4,
!org.apache.commons.codec*,
!org.apache.commons.collections*,
!org.apache.commons.configuration2*,
@@ -109,6 +110,7 @@
!org.apache.xml*,
!org.apache.zookeeper*,
!org.tukaani*,
+ !org.xerial.snappy*,
android*;resolution:=optional,
com.android*;resolution:=optional,
com.sun.javadoc;resolution:=optional,
@@ -169,6 +171,7 @@
jdiff,
net.jcip*,
net.minidev*,
+ net.jpountz.lz4,
org.apache.commons.codec*,
org.apache.commons.collections*,
org.apache.commons.configuration2*,
@@ -183,7 +186,8 @@
org.apache.commons.text*,
org.apache.xml.resolver*,
org.apache.zookeeper*,
- org.tukaani*
+ org.tukaani*,
+ org.xerial.snappy*
</Private-Package>
<_dsannotations>*</_dsannotations>
</instructions>
@@ -212,4 +216,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/appender/rest/pom.xml b/appender/rest/pom.xml
index f47f6d8..ca2e0bc 100644
--- a/appender/rest/pom.xml
+++ b/appender/rest/pom.xml
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Decanter :: Appender :: REST</name>
<properties>
- <cxf.version>3.4.2</cxf.version>
+ <cxf.version>3.4.4</cxf.version>
</properties>
<dependencies>
diff --git a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
index 5912bf8..83cb37f 100644
--- a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
+++ b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
@@ -40,7 +40,7 @@
ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
- Assert.assertEquals(12, eventAdmin.getPostEvents().size());
+ Assert.assertEquals(13, eventAdmin.getPostEvents().size());
Event camelContextStartingEvent = eventAdmin.getPostEvents().get(0);
Assert.assertEquals("test-context", camelContextStartingEvent.getProperty("camelContextName"));
@@ -58,19 +58,14 @@
Assert.assertEquals(org.apache.camel.impl.event.RouteAddedEvent.class.getName(), routeStartedEvent.getProperty("eventType"));
Assert.assertEquals("camelEvent", routeStartedEvent.getProperty("type"));
- Event camelContextStartedEvent = eventAdmin.getPostEvents().get(3);
- Assert.assertEquals("test-context", camelContextStartedEvent.getProperty("camelContextName"));
- Assert.assertEquals(org.apache.camel.impl.event.RouteStartedEvent.class.getName(), camelContextStartedEvent.getProperty("eventType"));
- Assert.assertEquals("camelEvent", camelContextStartedEvent.getProperty("type"));
-
Event exchangeSendingEvent = eventAdmin.getPostEvents().get(4);
Assert.assertEquals("test-context", exchangeSendingEvent.getProperty("camelContextName"));
- Assert.assertEquals(org.apache.camel.impl.event.CamelContextRoutesStartedEvent.class.getName(), exchangeSendingEvent.getProperty("eventType"));
+ Assert.assertEquals(org.apache.camel.impl.event.RouteStartedEvent.class.getName(), exchangeSendingEvent.getProperty("eventType"));
Assert.assertEquals("camelEvent", exchangeSendingEvent.getProperty("type"));
Event exchangeCreatedEvent = eventAdmin.getPostEvents().get(5);
Assert.assertEquals("test-context", exchangeCreatedEvent.getProperty("camelContextName"));
- Assert.assertEquals(org.apache.camel.impl.event.CamelContextStartedEvent.class.getName(), exchangeCreatedEvent.getProperty("eventType"));
+ Assert.assertEquals(org.apache.camel.impl.event.CamelContextRoutesStartedEvent.class.getName(), exchangeCreatedEvent.getProperty("eventType"));
Assert.assertEquals("camelEvent", exchangeCreatedEvent.getProperty("type"));
}
@@ -117,7 +112,7 @@
ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
- Assert.assertEquals(8, eventAdmin.getPostEvents().size());
+ Assert.assertEquals(9, eventAdmin.getPostEvents().size());
}
@Test
diff --git a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterInterceptStrategyTest.java b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterInterceptStrategyTest.java
index 60f816e..f3fac30 100644
--- a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterInterceptStrategyTest.java
+++ b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterInterceptStrategyTest.java
@@ -60,7 +60,6 @@
Assert.assertEquals("direct://start", rootObject.getString("fromEndpointUri"));
Assert.assertEquals("TEST", rootObject.getString("inBody"));
JsonObject propertiesObject = rootObject.getJsonObject("properties");
- Assert.assertEquals("log://foo", propertiesObject.getString("CamelToEndpoint"));
Assert.assertEquals("String", rootObject.getString("inBodyType"));
Assert.assertEquals("decanter/collect/camel/tracer", rootObject.getString("event_topics"));
System.out.println(marshaller.marshal(event));
diff --git a/collector/oshi/pom.xml b/collector/oshi/pom.xml
index 358deeb..ea621ee 100644
--- a/collector/oshi/pom.xml
+++ b/collector/oshi/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
- <version>5.4.1</version>
+ <version>5.8.2</version>
</dependency>
</dependencies>
diff --git a/collector/rest/pom.xml b/collector/rest/pom.xml
index b01fea7..66e1322 100644
--- a/collector/rest/pom.xml
+++ b/collector/rest/pom.xml
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Decanter :: Collector :: REST</name>
<properties>
- <cxf.version>3.4.2</cxf.version>
+ <cxf.version>3.4.4</cxf.version>
</properties>
<dependencies>
diff --git a/collector/soap/pom.xml b/collector/soap/pom.xml
index 921acde..72d8829 100644
--- a/collector/soap/pom.xml
+++ b/collector/soap/pom.xml
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Decanter :: Collector :: SOAP</name>
<properties>
- <cxf.version>3.4.2</cxf.version>
+ <cxf.version>3.4.4</cxf.version>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index fdcca20..ca76cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<baseline>1.0.0</baseline>
<baseline.skip>true</baseline.skip>
<activemq.version>5.15.13</activemq.version>
- <camel.version>3.7.1</camel.version>
+ <camel.version>3.11.1</camel.version>
<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>
