From 2f71c41af02be1f17ec18f2ecb87cd29e9d0f9ca Mon Sep 17 00:00:00 2001
From: Robert Volkmann <20912167+robertvolkmann@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:29:17 +0100
Subject: [PATCH] dependencies: upgrade Camel 2.25.1 to 3.18.1 (#2318)

---
 eip-aggregator/pom.xml                                |  2 +-
 .../aggregator/routes/MessageAggregationStrategy.java |  2 +-
 .../routes/MessageAggregationStrategyTest.java        | 11 +++++++----
 eip-splitter/pom.xml                                  |  2 +-
 eip-wire-tap/pom.xml                                  |  2 +-
 pom.xml                                               |  2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/eip-aggregator/pom.xml b/eip-aggregator/pom.xml
index 38cc58f0d..f24a205dd 100644
--- a/eip-aggregator/pom.xml
+++ b/eip-aggregator/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel</groupId>
+      <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-boot</artifactId>
       <version>${camel.version}</version>
     </dependency>
diff --git a/eip-aggregator/src/main/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategy.java b/eip-aggregator/src/main/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategy.java
index 9b15c9666..07d3f2eeb 100644
--- a/eip-aggregator/src/main/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategy.java
+++ b/eip-aggregator/src/main/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategy.java
@@ -24,8 +24,8 @@
  */
 package com.iluwatar.eip.aggregator.routes;
 
+import org.apache.camel.AggregationStrategy;
 import org.apache.camel.Exchange;
-import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/eip-aggregator/src/test/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategyTest.java b/eip-aggregator/src/test/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategyTest.java
index d1173d18c..ed5d46e7b 100644
--- a/eip-aggregator/src/test/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategyTest.java
+++ b/eip-aggregator/src/test/java/com/iluwatar/eip/aggregator/routes/MessageAggregationStrategyTest.java
@@ -27,7 +27,8 @@ package com.iluwatar.eip.aggregator.routes;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.impl.engine.SimpleCamelContext;
+import org.apache.camel.support.DefaultExchange;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -35,13 +36,15 @@ import org.junit.jupiter.api.Test;
  */
 class MessageAggregationStrategyTest {
 
+  private final CamelContext context = new SimpleCamelContext();
+  
   @Test
   void testAggregate() {
     var mas = new MessageAggregationStrategy();
-    var oldExchange = new DefaultExchange((CamelContext) null);
+    var oldExchange = new DefaultExchange(context);
     oldExchange.getIn().setBody("TEST1");
 
-    var newExchange = new DefaultExchange((CamelContext) null);
+    var newExchange = new DefaultExchange(context);
     newExchange.getIn().setBody("TEST2");
 
     var output = mas.aggregate(oldExchange, newExchange);
@@ -53,7 +56,7 @@ class MessageAggregationStrategyTest {
   void testAggregateOldNull() {
     var mas = new MessageAggregationStrategy();
 
-    var newExchange = new DefaultExchange((CamelContext) null);
+    var newExchange = new DefaultExchange(context);
     newExchange.getIn().setBody("TEST2");
 
     var output = mas.aggregate(null, newExchange);
diff --git a/eip-splitter/pom.xml b/eip-splitter/pom.xml
index 4d3efea3f..49d2cf9e0 100644
--- a/eip-splitter/pom.xml
+++ b/eip-splitter/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel</groupId>
+      <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-boot</artifactId>
       <version>${camel.version}</version>
     </dependency>
diff --git a/eip-wire-tap/pom.xml b/eip-wire-tap/pom.xml
index a543399fd..cd9ad116f 100644
--- a/eip-wire-tap/pom.xml
+++ b/eip-wire-tap/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.camel</groupId>
+      <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-boot</artifactId>
       <version>${camel.version}</version>
     </dependency>
diff --git a/pom.xml b/pom.xml
index f8adbff43..c17a31bca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     <spring-boot.version>2.7.5</spring-boot.version>
     <jacoco.version>0.8.8</jacoco.version>
     <commons-dbcp.version>1.4</commons-dbcp.version>
-    <camel.version>2.25.1</camel.version>
+    <camel.version>3.18.3</camel.version>
     <guava.version>19.0</guava.version>
     <htmlunit.version>2.66.0</htmlunit.version>
     <guice.version>4.0</guice.version>