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 2016/06/08 15:37:50 UTC
[2/2] camel git commit: CAMEL-9419: Generate spring-boot auto
configuration for all Camel components that has options that can be
configured.
CAMEL-9419: Generate spring-boot auto configuration for all Camel components that has options that can be configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d046e9d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d046e9d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d046e9d
Branch: refs/heads/master
Commit: 3d046e9d17e17afdeee735eddd79dc24ff4fb279
Parents: 192c557
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jun 8 17:29:37 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 8 17:37:42 2016 +0200
----------------------------------------------------------------------
components/camel-cxf/pom.xml | 3 ++-
components/camel-spring/pom.xml | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3d046e9d/components/camel-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 55622d3..e8dd19f 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -31,6 +31,8 @@
<properties>
<camel.osgi.import>
+ !org.springframework.boot.*,
+ !org.springframework.context.annotation.*;resolution:=optional,
!org.apache.camel.component.cxf,
!org.apache.camel.component.cxf.blueprint,
!org.apache.camel.component.cxf.converter,
@@ -61,7 +63,6 @@
org.apache.camel.blueprint;resolution:=optional,
*
</camel.osgi.import>
-
<camel.osgi.export>
org.apache.camel.component.cxf;${camel.osgi.version},
org.apache.camel.component.cxf.blueprint;${camel.osgi.version},
http://git-wip-us.apache.org/repos/asf/camel/blob/3d046e9d/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 026a6c4..971148c 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -32,6 +32,8 @@
<properties>
<!-- use spring-all-version-range to support camel-spring-dm also -->
<camel.osgi.import>
+ !org.springframework.boot.*,
+ !org.springframework.context.annotation.*;resolution:=optional,
!org.apache.camel.spring.*,
!org.apache.camel.component,
!org.apache.camel.component.event,