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 2020/03/24 14:19:15 UTC
[camel] 02/02: CAMEL-14779: Move Main out of camel-spring due to
osgi circular dependency issue
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58300b87b1694f829b95db03712b8ab9ee4e4f73
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 24 15:11:33 2020 +0100
CAMEL-14779: Move Main out of camel-spring due to osgi circular dependency issue
---
apache-camel/src/main/descriptors/common-bin.xml | 1 +
parent/pom.xml | 5 +++++
tooling/maven/camel-maven-plugin/pom.xml | 3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index fa8cf91a..1c3aaba0 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -336,6 +336,7 @@
<include>org.apache.camel:camel-spring-integration</include>
<include>org.apache.camel:camel-spring-javaconfig</include>
<include>org.apache.camel:camel-spring-ldap</include>
+ <include>org.apache.camel:camel-spring-main</include>
<include>org.apache.camel:camel-spring-redis</include>
<include>org.apache.camel:camel-spring-security</include>
<include>org.apache.camel:camel-spring-ws</include>
diff --git a/parent/pom.xml b/parent/pom.xml
index 872b410..dafb2e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2332,6 +2332,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-spring-batch</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml
index 7e8f78a..dac5ab7 100644
--- a/tooling/maven/camel-maven-plugin/pom.xml
+++ b/tooling/maven/camel-maven-plugin/pom.xml
@@ -77,9 +77,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+ <!-- camel-spring-main has Main class for running Spring -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-spring-main</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>