You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/01/19 08:05:05 UTC
(camel-spring-boot) branch main updated: CAMEL-20308 Reverse the order of spring-boot-dependencies and camel-spring-boot-bom (#1066)
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 97b451f22aa CAMEL-20308 Reverse the order of spring-boot-dependencies and camel-spring-boot-bom (#1066)
97b451f22aa is described below
commit 97b451f22aa02e6e041e934caf0a53c6869bacf2
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Fri Jan 19 03:05:00 2024 -0500
CAMEL-20308 Reverse the order of spring-boot-dependencies and camel-spring-boot-bom (#1066)
---
.../src/main/resources/archetype-resources/pom.xml | 16 ++++++++--------
.../src/test/resources/application-pom-sb3.xml | 12 ++++++------
tooling/camel-starter-parent/pom.xml | 16 ++++++++--------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
index b0762cb1028..54d9cb7011d 100644
--- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
@@ -36,14 +36,6 @@
<dependencyManagement>
<dependencies>
- <!-- 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>
<!-- Camel BOM -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
@@ -52,6 +44,14 @@
<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>
diff --git a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml
index fac447f4969..4cde6afebc5 100644
--- a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml
+++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb3.xml
@@ -34,16 +34,16 @@
<!-- The two BOMs -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-bom</artifactId>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-bom</artifactId>
- <version>${project.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/tooling/camel-starter-parent/pom.xml b/tooling/camel-starter-parent/pom.xml
index d7afee28aa0..42f28f364bb 100644
--- a/tooling/camel-starter-parent/pom.xml
+++ b/tooling/camel-starter-parent/pom.xml
@@ -47,20 +47,20 @@
<dependencies>
- <!-- The spring-boot dependencies will be used by end users, so it's ok to use it in the parent -->
+ <!-- What's in the user BOM is OK for the parent -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-dependencies</artifactId>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- What's in the user BOM is OK for the parent -->
+ <!-- The spring-boot dependencies will be used by end users, so it's ok to use it in the parent -->
<dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-dependencies</artifactId>
- <version>${project.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>