From aa2206336fc95cd3655db7af95ce620dfb888d0e Mon Sep 17 00:00:00 2001
From: Jonathan Cook <jonathan.cook@erars.plus.com>
Date: Tue, 22 Feb 2022 21:16:38 +0100
Subject: [PATCH] BAEL-5408 - Update Camel version in spring-boot-camel module
 (#11851)

* BAEL-4706 - Spring Boot with Spring Batch

* BAEL-3948 - Fix test(s) in spring-batch which leaves repository.sqlite
changed

* BAEL-4736 - Convert JSONArray to List of Object using camel-jackson

* BAEL-4756 - Mockito MockSettings

* BAEL-4756 - Mockito MockSettings - fix spelling

* BAEL-2674 - Upgrade the Okhttp article

* BAEL-4204 - Adding Interceptors in OkHTTP

* BAEL-4836 - Mocking Static Methods with Mockito

* BAEL-4205 - A Guide to Events in OkHTTP

* BAEL-5408 - Update Camel version in spring-boot-camel module

Co-authored-by: Jonathan Cook <jcook@sciops.esa.int>
---
 pom.xml                                       |  6 ++++--
 spring-boot-modules/pom.xml                   |  1 -
 spring-boot-modules/spring-boot-camel/pom.xml | 11 ++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f5378f9961..99217774e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1343,7 +1343,8 @@
                  <module>persistence-modules/spring-data-cassandra-2</module>
                  <module>quarkus-vs-springboot</module>
                  <module>quarkus-jandex</module>
-                 <module>spring-boot-modules/spring-boot-cassandre</module>
+		 <module>spring-boot-modules/spring-boot-cassandre</module>
+		 <module>spring-boot-modules/spring-boot-camel</module>	 
                  <module>testing-modules/testing-assertions</module>
             </modules>
         </profile>
@@ -1400,7 +1401,8 @@
                 <module>persistence-modules/spring-data-cassandra-2</module>
                 <module>quarkus-vs-springboot</module>
                 <module>quarkus-jandex</module>
-                <module>spring-boot-modules/spring-boot-cassandre</module>
+		<module>spring-boot-modules/spring-boot-cassandre</module>
+		<module>spring-boot-modules/spring-boot-camel</module>
                 <module>testing-modules/testing-assertions</module>
             </modules>
         </profile>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index c1a96a0604..fabd54aa92 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -36,7 +36,6 @@
         <module>spring-boot-deployment</module>
         <module>spring-boot-di</module>
         <module>spring-boot-disable-logging</module>
-        <module>spring-boot-camel</module>
         <module>spring-boot-ci-cd</module>
         <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
         <module>spring-boot-custom-starter</module>
diff --git a/spring-boot-modules/spring-boot-camel/pom.xml b/spring-boot-modules/spring-boot-camel/pom.xml
index 5d5e2ce6bd..5bda1b2351 100644
--- a/spring-boot-modules/spring-boot-camel/pom.xml
+++ b/spring-boot-modules/spring-boot-camel/pom.xml
@@ -16,22 +16,22 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.camel</groupId>
+            <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-servlet-starter</artifactId>
             <version>${camel.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
+            <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-jackson-starter</artifactId>
             <version>${camel.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
+            <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-swagger-java-starter</artifactId>
             <version>${camel.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
+            <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-spring-boot-starter</artifactId>
             <version>${camel.version}</version>
         </dependency>
@@ -64,7 +64,8 @@
     </build>
 
     <properties>
-        <camel.version>3.0.0-M4</camel.version>
+        <java.version>11</java.version>
+        <camel.version>3.15.0</camel.version>
     </properties>
 
 </project>
\ No newline at end of file