Repository: camel Updated Branches: refs/heads/master 125519915 -> 74fc02f66
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/74fc02f6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74fc02f6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74fc02f6 Branch: refs/heads/master Commit: 74fc02f6663ad3677a95d916c87fcd23751266c2 Parents: 1255199 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jun 8 16:12:39 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jun 8 16:12:39 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/74fc02f6/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2e3c119..09fb742 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -621,7 +621,7 @@ <camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version> <camel.osgi.import.defaults> !org.springframework.boot.*, - !org.springframework.context.annotation.*, + !org.springframework.context.annotation.*;resolution:=optional, org.osgi.framework;version="[1.5,2)", org.osgi.framework.wiring;version="[1.0,2)", org.springframework.ws.*;version="[2,3)",
