From commits-return-66546-archive-asf-public=cust-asf.ponee.io@camel.apache.org Sat Nov 10 17:06:39 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 90B28180668 for ; Sat, 10 Nov 2018 17:06:38 +0100 (CET) Received: (qmail 87297 invoked by uid 500); 10 Nov 2018 16:06:37 -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 87288 invoked by uid 99); 10 Nov 2018 16:06:37 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Nov 2018 16:06:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 326F78291A; Sat, 10 Nov 2018 16:06:37 +0000 (UTC) Date: Sat, 10 Nov 2018 16:06:37 +0000 To: "commits@camel.apache.org" Subject: [camel] branch sandbox/camel-3.x updated: Fix camel-nsq-starter MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154186599689.24161.972613978863523798@gitbox.apache.org> From: lburgazzoli@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/sandbox/camel-3.x X-Git-Reftype: branch X-Git-Oldrev: 58085d5bdbbfc626182a3a6017f8ab032cd01e3b X-Git-Newrev: 5956dadc4747c47f22bdd754d9e0ed1090176a02 X-Git-Rev: 5956dadc4747c47f22bdd754d9e0ed1090176a02 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/sandbox/camel-3.x by this push: new 5956dad Fix camel-nsq-starter 5956dad is described below commit 5956dadc4747c47f22bdd754d9e0ed1090176a02 Author: lburgazzoli AuthorDate: Sat Nov 10 17:06:17 2018 +0100 Fix camel-nsq-starter --- .../camel/component/nsq/springboot/NsqComponentAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java index 881648e..dbab909 100644 --- a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Generated; + import org.apache.camel.CamelContext; import org.apache.camel.component.nsq.NsqComponent; import org.apache.camel.spi.ComponentCustomizer; @@ -30,13 +31,12 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; -import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext;