(camel) branch main updated: CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 457210a0dff CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent
457210a0dff is described below

commit 457210a0dffae449c7290e3ba0f4393d6d98c2c8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 25 14:22:12 2024 +0100

    CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent
---
 .../ROOT/pages/camel-4x-upgrade-guide-4_4.adoc     | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
index f808eeaf5a0..4b48639bc7b 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc
@@ -144,6 +144,38 @@ The component now has support for batch processing.
 
 == Camel Spring Boot
 
+=== Ordering of BOM imports
+
+When using Camel on Spring Boot, it's recommended to use BOMs to import Camel and Spring dependencies.
+In Camel 4.4 onwards we changed the order to let Camel be first as shown below:
+
+[source,xml]
+----
+<dependencyManagement>
+    <dependencies>
+        <!-- Camel BOM -->
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-spring-boot-bom</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <!-- Spring Boot BOM -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-dependencies</artifactId>
+            <version>${spring-boot-version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+----
+
+In previous versions, then we would have `spring-boot-dependencies` before `camel-spring-boot-bom`. However to better
+align and ensure Camel starters are using supported dependencies, then it's recommended to let Camel be first.
+
 === Auto Configuration
 
 The route controller configuration has been moved from general main to its own group.