Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A74BD1981E for ; Thu, 14 Apr 2016 05:43:24 +0000 (UTC) Received: (qmail 24889 invoked by uid 500); 14 Apr 2016 05:43:24 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 24782 invoked by uid 500); 14 Apr 2016 05:43:24 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 24633 invoked by uid 99); 14 Apr 2016 05:43:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2016 05:43:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 670D1DFC4F; Thu, 14 Apr 2016 05:43:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Thu, 14 Apr 2016 05:43:27 -0000 Message-Id: In-Reply-To: <02a123901bcf4a36bd5aa22460e2e4b1@git.apache.org> References: <02a123901bcf4a36bd5aa22460e2e4b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] camel git commit: CAMEL-9866 @PropertyInject doesn't work with Spring-Boot CAMEL-9866 @PropertyInject doesn't work with Spring-Boot Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dd45d216 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dd45d216 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dd45d216 Branch: refs/heads/camel-2.17.x Commit: dd45d2162c0564e59b316316efa39644053f54d2 Parents: 57f9f49 Author: Tomas Rohovsky Authored: Wed Apr 13 22:34:35 2016 +0200 Committer: Claus Ibsen Committed: Thu Apr 14 07:42:58 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/spring/boot/CamelAutoConfiguration.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dd45d216/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java index caedaf1..771ff27 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java @@ -128,7 +128,6 @@ public class CamelAutoConfiguration { } else { PropertiesComponent pc = new PropertiesComponent(); pc.setPropertiesParser(parser); - camelContext.addComponent("properties", pc); return pc; } }