(camel-spring-boot) 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-spring-boot.git


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

commit dc4eae6b865549828a5b807dff1776d3366e8f4e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 25 14:26:45 2024 +0100

    CAMEL-20308: Change order of camel-spring-boot-bom and spring-boot-dependencies in dependencyManamgent
---
 docs/spring-boot/modules/ROOT/pages/index.adoc | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/spring-boot/modules/ROOT/pages/index.adoc b/docs/spring-boot/modules/ROOT/pages/index.adoc
index eea67536f0a..32dcfe3de1a 100644
--- a/docs/spring-boot/modules/ROOT/pages/index.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/index.adoc
@@ -2,29 +2,37 @@
 
 Camel support for Spring Boot provides auto-configuration of the Camel and starters for many Camel xref:components::index.adoc[components]. Our opinionated auto-configuration of the Camel context auto-detects Camel routes available in the Spring context and registers the key Camel utilities (like producer template, consumer template and the type converter) as beans.
 
-Get started by adding the Camel Spring Boot BOM to your Maven `pom.xml` file.
+Get started by adding the Camel and Spring Boot BOMs to your Maven `pom.xml` file.
 
 [source,xml]
 ----
 <dependencyManagement>
-
     <dependencies>
         <!-- Camel BOM -->
         <dependency>
             <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-spring-boot-bom</artifactId>
-            <version>${project.version}</version>
+            <version>${camel-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>
-        <!-- ... other BOMs or dependencies ... -->
     </dependencies>
-
 </dependencyManagement>
+
 ----
 
 The `camel-spring-boot-bom` is a basic BOM that only holds the list of Camel Spring Boot starter JARs.
 
+NOTE: It is recommended to import Camel Spring Boot BOM before Spring Boot BOM to ensure Camel dependencies are using supported JARs from the release. However, you can flip the order, and let Spring Boot BOM be first. However, you may encounter some dependency mis-aligments in some rare situations.
+
 Next, add the xref:spring-boot.adoc[Camel Spring Boot starter] to startup the xref:manual::camelcontext.adoc[Camel Context].
 
 [source,xml]