[karaf-decanter] branch main updated: [KARAF-7361] Upgrade to Apache Camel 3.14.1

[jbonofre]

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 5f3850e  [KARAF-7361] Upgrade to Apache Camel 3.14.1
     new 3f7853d  Merge pull request #278 from jbonofre/KARAF-7361
5f3850e is described below

commit 5f3850eb3e9f230f0f31de715ced74eb65372c48
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Fri Jan 28 10:58:44 2022 +0100

    [KARAF-7361] Upgrade to Apache Camel 3.14.1
---
 .../collector/camel/DecanterEventNotifierTest.java     | 18 ++++++------------
 pom.xml                                                |  2 +-
 2 files changed, 7 insertions(+), 13 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 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 @@ public class DecanterEventNotifierTest {
         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 @@ public class DecanterEventNotifierTest {
         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/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>