Merge pull request #281 from jbonofre/KARAF-7344
[KARAF-7344] Upgrade to aws-java-sdk 1.12.136
diff --git a/alerting/service/pom.xml b/alerting/service/pom.xml
index 8672096..27a0b48 100644
--- a/alerting/service/pom.xml
+++ b/alerting/service/pom.xml
@@ -34,7 +34,7 @@
<name>Apache Karaf :: Decanter :: Alerting :: Service</name>
<properties>
- <lucene.version>8.9.0</lucene.version>
+ <lucene.version>8.11.1</lucene.version>
</properties>
<dependencies>
diff --git a/appender/websocket-servlet/pom.xml b/appender/websocket-servlet/pom.xml
index 7e5cb5c..5b9082b 100644
--- a/appender/websocket-servlet/pom.xml
+++ b/appender/websocket-servlet/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
- <version>9.4.43.v20210629</version>
+ <version>9.4.44.v20210927</version>
<scope>provided</scope>
</dependency>
<dependency>
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 036f9d3..7434758 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
@@ -39,32 +39,26 @@
ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
- Assert.assertEquals(13, eventAdmin.getPostEvents().size());
+ Assert.assertEquals(15, eventAdmin.getPostEvents().size());
Event camelContextStartingEvent = eventAdmin.getPostEvents().get(0);
Assert.assertEquals("test-context", camelContextStartingEvent.getProperty("camelContextName"));
- Assert.assertEquals(org.apache.camel.impl.event.CamelContextStartingEvent.class.getName(), camelContextStartingEvent.getProperty("eventType"));
+ Assert.assertEquals(org.apache.camel.impl.event.CamelContextInitializingEvent.class.getName(), camelContextStartingEvent.getProperty("eventType"));
Assert.assertEquals("camelEvent", camelContextStartingEvent.getProperty("type"));
Event routeAddedEvent = eventAdmin.getPostEvents().get(1);
Assert.assertEquals("test-context", routeAddedEvent.getProperty("camelContextName"));
- Assert.assertEquals(org.apache.camel.impl.event.CamelContextRoutesStartingEvent.class.getName(), routeAddedEvent.getProperty("eventType"));
+ Assert.assertEquals(org.apache.camel.impl.event.CamelContextInitializedEvent.class.getName(), routeAddedEvent.getProperty("eventType"));
Assert.assertEquals("camelEvent", routeAddedEvent.getProperty("type"));
- Event routeStartedEvent = eventAdmin.getPostEvents().get(2);
- Assert.assertEquals("test-context", routeStartedEvent.getProperty("camelContextName"));
- Assert.assertEquals("test-route", routeStartedEvent.getProperty("routeId"));
- Assert.assertEquals(org.apache.camel.impl.event.RouteAddedEvent.class.getName(), routeStartedEvent.getProperty("eventType"));
- Assert.assertEquals("camelEvent", routeStartedEvent.getProperty("type"));
-
Event exchangeSendingEvent = eventAdmin.getPostEvents().get(4);
Assert.assertEquals("test-context", exchangeSendingEvent.getProperty("camelContextName"));
- Assert.assertEquals(org.apache.camel.impl.event.RouteStartedEvent.class.getName(), exchangeSendingEvent.getProperty("eventType"));
+ Assert.assertEquals(org.apache.camel.impl.event.RouteAddedEvent.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.CamelContextRoutesStartedEvent.class.getName(), exchangeCreatedEvent.getProperty("eventType"));
+ Assert.assertEquals(org.apache.camel.impl.event.RouteStartingEvent.class.getName(), exchangeCreatedEvent.getProperty("eventType"));
Assert.assertEquals("camelEvent", exchangeCreatedEvent.getProperty("type"));
}
@@ -96,7 +90,7 @@
ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
- Assert.assertEquals(6, eventAdmin.getPostEvents().size());
+ Assert.assertEquals(8, eventAdmin.getPostEvents().size());
}
@Test
diff --git a/collector/jetty/pom.xml b/collector/jetty/pom.xml
index 2805e5c..c1f7c0f 100644
--- a/collector/jetty/pom.xml
+++ b/collector/jetty/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.43.v20210629</version>
+ <version>9.4.44.v20210927</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/itest/pom.xml b/itest/pom.xml
index 82721b1..f76b4e4 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
- <version>9.4.43.v20210629</version>
+ <version>9.4.44.v20210927</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 6b32247..6880df6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<baseline>1.0.0</baseline>
<baseline.skip>true</baseline.skip>
<activemq.version>5.15.13</activemq.version>
- <camel.version>3.11.1</camel.version>
+ <camel.version>3.14.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>
