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 2019/01/21 07:35:37 UTC
[camel] branch master updated: Fixed spring boot issues with
splitup of components from camel-core.
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
The following commit(s) were added to refs/heads/master by this push:
new f20e865 Fixed spring boot issues with splitup of components from camel-core.
f20e865 is described below
commit f20e8652b1f058e36fbf58cba47174b4de2925b7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 21 08:35:16 2019 +0100
Fixed spring boot issues with splitup of components from camel-core.
---
apache-camel/pom.xml | 47 ++++++++++++++++++
bom/camel-bom/pom.xml | 45 ++++++++++++++++++
parent/pom.xml | 47 ++++++++++++++++++
.../src/main/resources/META-INF/spring.factories | 55 +++++++++-------------
.../camel-spring-boot-dependencies/pom.xml | 45 ++++++++++++++++++
5 files changed, 207 insertions(+), 32 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 3fb88f4..2de13a5 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1086,6 +1086,53 @@
<artifactId>camel-zookeeper-master</artifactId>
</dependency>
+ <!-- camel starters core components -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-direct-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-directvm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-language-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-log-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-ref-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-seda-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-stub-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-timer-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-vm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- camel starters -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 56ee515..d40edc7 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -580,6 +580,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-direct-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-directvm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-disruptor</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1430,6 +1440,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-language-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-ldap</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1475,6 +1490,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-log-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-lra</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1936,6 +1956,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-ref-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-rest-swagger</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2051,6 +2076,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-seda-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-service</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2396,6 +2426,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-stub-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2506,6 +2541,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-timer-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-twilio</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2571,6 +2611,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-vm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-weather</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5dce522..76a4269 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2276,6 +2276,53 @@
<version>${project.version}</version>
</dependency>
+ <!-- camel starters core components -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-direct-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-directvm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-language-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-log-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-ref-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-seda-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-stub-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-timer-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-vm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- camel starters -->
<dependency>
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories
index d692024..3d36bb3 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories
@@ -15,46 +15,37 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.direct.springboot.DirectComponentAutoConfiguration,\
-org.apache.camel.component.vm.springboot.VmComponentAutoConfiguration,\
-org.apache.camel.component.directvm.springboot.DirectVmComponentAutoConfiguration,\
-org.apache.camel.component.seda.springboot.SedaComponentAutoConfiguration,\
-org.apache.camel.component.log.springboot.LogComponentAutoConfiguration,\
-org.apache.camel.component.stub.springboot.StubComponentAutoConfiguration,\
+org.apache.camel.component.bean.springboot.BeanComponentAutoConfiguration,\
+org.apache.camel.component.beanclass.springboot.ClassComponentAutoConfiguration,\
+org.apache.camel.component.browse.springboot.BrowseComponentAutoConfiguration,\
+org.apache.camel.component.controlbus.springboot.ControlBusComponentAutoConfiguration,\
+org.apache.camel.component.dataformat.springboot.DataFormatComponentAutoConfiguration,\
+org.apache.camel.component.dataset.springboot.DataSetComponentAutoConfiguration,\
+org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceAutoConfiguration,\
+org.apache.camel.component.file.springboot.FileComponentAutoConfiguration,\
+org.apache.camel.component.mock.springboot.MockComponentAutoConfiguration,\
+org.apache.camel.component.properties.springboot.PropertiesComponentAutoConfiguration,\
+org.apache.camel.component.rest.springboot.RestApiComponentAutoConfiguration,\
+org.apache.camel.component.rest.springboot.RestComponentAutoConfiguration,\
+org.apache.camel.component.saga.springboot.SagaComponentAutoConfiguration,\
org.apache.camel.component.scheduler.springboot.SchedulerComponentAutoConfiguration,\
-org.apache.camel.component.xslt.springboot.XsltComponentAutoConfiguration,\
+org.apache.camel.component.test.springboot.TestComponentAutoConfiguration,\
org.apache.camel.component.validator.springboot.ValidatorComponentAutoConfiguration,\
-org.apache.camel.component.properties.springboot.PropertiesComponentAutoConfiguration,\
-org.apache.camel.impl.springboot.StringDataFormatAutoConfiguration,\
-org.apache.camel.impl.springboot.ZipDataFormatAutoConfiguration,\
+org.apache.camel.component.xslt.springboot.XsltComponentAutoConfiguration,\
org.apache.camel.impl.springboot.GzipDataFormatAutoConfiguration,\
org.apache.camel.impl.springboot.SerializationDataFormatAutoConfiguration,\
-org.apache.camel.language.constant.springboot.ConstantLanguageAutoConfiguration,\
-org.apache.camel.language.simple.springboot.SimpleLanguageAutoConfiguration,\
-org.apache.camel.language.ref.springboot.RefLanguageAutoConfiguration,\
+org.apache.camel.impl.springboot.StringDataFormatAutoConfiguration,\
+org.apache.camel.impl.springboot.ZipDataFormatAutoConfiguration,\
org.apache.camel.language.bean.springboot.BeanLanguageAutoConfiguration,\
+org.apache.camel.language.constant.springboot.ConstantLanguageAutoConfiguration,\
org.apache.camel.language.header.springboot.HeaderLanguageAutoConfiguration,\
-org.apache.camel.language.xpath.springboot.XPathLanguageAutoConfiguration,\
-org.apache.camel.language.simple.springboot.FileLanguageAutoConfiguration,\
org.apache.camel.language.property.springboot.ExchangePropertyLanguageAutoConfiguration,\
+org.apache.camel.language.ref.springboot.RefLanguageAutoConfiguration,\
+org.apache.camel.language.simple.springboot.FileLanguageAutoConfiguration,\
+org.apache.camel.language.simple.springboot.SimpleLanguageAutoConfiguration,\
org.apache.camel.language.tokenizer.springboot.TokenizeLanguageAutoConfiguration,\
org.apache.camel.language.tokenizer.springboot.XMLTokenizeLanguageAutoConfiguration,\
-org.apache.camel.component.rest.springboot.RestComponentAutoConfiguration,\
-org.apache.camel.component.ref.springboot.RefComponentAutoConfiguration,\
-org.apache.camel.component.controlbus.springboot.ControlBusComponentAutoConfiguration,\
-org.apache.camel.component.mock.springboot.MockComponentAutoConfiguration,\
-org.apache.camel.component.browse.springboot.BrowseComponentAutoConfiguration,\
-org.apache.camel.component.language.springboot.LanguageComponentAutoConfiguration,\
-org.apache.camel.component.file.springboot.FileComponentAutoConfiguration,\
-org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceAutoConfiguration,\
-org.apache.camel.component.timer.springboot.TimerComponentAutoConfiguration,\
-org.apache.camel.component.test.springboot.TestComponentAutoConfiguration,\
-org.apache.camel.component.beanclass.springboot.ClassComponentAutoConfiguration,\
-org.apache.camel.component.dataset.springboot.DataSetComponentAutoConfiguration,\
-org.apache.camel.component.bean.springboot.BeanComponentAutoConfiguration,\
-org.apache.camel.component.dataformat.springboot.DataFormatComponentAutoConfiguration,\
-org.apache.camel.component.rest.springboot.RestApiComponentAutoConfiguration,\
-org.apache.camel.model.rest.springboot.RestConfigurationDefinitionAutoConfiguration,\
-org.apache.camel.component.saga.springboot.SagaComponentAutoConfiguration
+org.apache.camel.language.xpath.springboot.XPathLanguageAutoConfiguration,\
+org.apache.camel.model.rest.springboot.RestConfigurationDefinitionAutoConfiguration
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index fd419d0..6f7cfa0 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -795,6 +795,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-direct-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-directvm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-disruptor</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1645,6 +1655,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-language-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-ldap</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1690,6 +1705,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-log-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-lra</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2151,6 +2171,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-ref-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-rest-swagger</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2266,6 +2291,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-seda-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-service</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2611,6 +2641,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-stub-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2721,6 +2756,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-timer-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-twilio</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2786,6 +2826,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-vm-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-weather</artifactId>
<version>${project.version}</version>
</dependency>