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 2021/09/07 07:37:18 UTC
[karaf-decanter] branch main updated: [KARAF-7209] Upgrade to Camel
3.11.1
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/main by this push:
new a757976 [KARAF-7209] Upgrade to Camel 3.11.1
new aecb724 Merge pull request #259 from jbonofre/KARAF-7209
a757976 is described below
commit a7579769eb0bdfc36fbd7a7c9686c95fadb7df50
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Sep 6 21:58:38 2021 +0200
[KARAF-7209] Upgrade to Camel 3.11.1
---
.../decanter/collector/camel/DecanterEventNotifierTest.java | 13 ++++---------
.../collector/camel/DecanterInterceptStrategyTest.java | 1 -
pom.xml | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
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 @@ public class DecanterEventNotifierTest {
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 @@ public class DecanterEventNotifierTest {
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 @@ public class DecanterEventNotifierTest {
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 @@ public class DecanterInterceptStrategyTest {
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/pom.xml b/pom.xml
index 80bacc8..bfd4708 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>