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 2023/03/24 09:37:04 UTC
[camel-spring-boot] branch main updated: CAMEL-19156: XML routes loader (jaxb) should load routes-configurations
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 849b2b78866 CAMEL-19156: XML routes loader (jaxb) should load routes-configurations
849b2b78866 is described below
commit 849b2b78866fc8a71a136933a4eb75334699edd0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 24 10:32:27 2023 +0100
CAMEL-19156: XML routes loader (jaxb) should load routes-configurations
---
core/camel-spring-boot-xml/pom.xml | 2 +-
core/camel-spring-boot/pom.xml | 19 ++++++++++---------
dsl-starter/camel-xml-jaxb-dsl-starter/pom.xml | 5 +++++
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/core/camel-spring-boot-xml/pom.xml b/core/camel-spring-boot-xml/pom.xml
index 55b60fade87..c9a4fdf9c3c 100644
--- a/core/camel-spring-boot-xml/pom.xml
+++ b/core/camel-spring-boot-xml/pom.xml
@@ -44,7 +44,7 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot</artifactId>
<exclusions>
- <!-- we want to use jaxb xml based routes loader -->
+ <!-- we want to use jaxb xml based routes loader that works with Spring XML <beans> files -->
<exclusion>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-io</artifactId>
diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml
index c147f8e8ef3..0dd9b577da3 100644
--- a/core/camel-spring-boot/pom.xml
+++ b/core/camel-spring-boot/pom.xml
@@ -77,15 +77,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
- <!-- requires xml routes loader that is jaxb based -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-xml-jaxb-dsl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-xml</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
@@ -108,6 +99,16 @@
</dependency>
<!-- Testing dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-xml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-jaxb-dsl</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring-junit5</artifactId>
diff --git a/dsl-starter/camel-xml-jaxb-dsl-starter/pom.xml b/dsl-starter/camel-xml-jaxb-dsl-starter/pom.xml
index 07e7d1fe137..2056b2b356a 100644
--- a/dsl-starter/camel-xml-jaxb-dsl-starter/pom.xml
+++ b/dsl-starter/camel-xml-jaxb-dsl-starter/pom.xml
@@ -39,6 +39,11 @@
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-xml-starter</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxb-dsl</artifactId>