From 8c974430733381670c9494c2e87c1a6054ada079 Mon Sep 17 00:00:00 2001
From: montgolfiere <jan.vonka@alfresco.com>
Date: Tue, 22 Feb 2022 11:08:42 +0000
Subject: [PATCH] ACS-2476: Update to Camel 3.15.0 (#981)

* ACS-2476: Update to Camel 3.15.0 (inc Netty 4.1.73.Final)

- note: also Gytheio 0.16 (~ Camel 3.15.0)
- see also ACS-2561
---
 pom.xml            | 14 +++++++-------
 repository/pom.xml |  6 +++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index cfbfcde6c5..0a947aa0e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
         <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
         <dependency.keycloak.version>15.0.2</dependency.keycloak.version>
         <dependency.jboss.logging.version>3.4.3.Final</dependency.jboss.logging.version>
-        <dependency.camel.version>3.7.7</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
+        <dependency.camel.version>3.15.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
         <dependency.activemq.version>5.16.1</dependency.activemq.version>
         <dependency.apache-compress.version>1.21</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
@@ -766,7 +766,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
-                <artifactId>camel-spring</artifactId>
+                <artifactId>camel-core</artifactId>
+                <version>${dependency.camel.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.camel</groupId>
+                <artifactId>camel-spring-xml</artifactId>
                 <version>${dependency.camel.version}</version>
                 <exclusions>
                     <exclusion>
@@ -795,11 +800,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-http</artifactId>
-                <version>4.1.72.Final</version>
-            </dependency>
             <dependency>
                 <!--  If you are going to bump dependency.camel.version, please check if the netty-codec-http has higher version that the one above.-->
                 <groupId>org.apache.camel</groupId>
diff --git a/repository/pom.xml b/repository/pom.xml
index 3ca8f41665..57b3d9ff7c 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -656,7 +656,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring</artifactId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>