Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 99465200D09 for ; Tue, 12 Sep 2017 09:03:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 97EA81609C7; Tue, 12 Sep 2017 07:03:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E0D351609C6 for ; Tue, 12 Sep 2017 09:03:44 +0200 (CEST) Received: (qmail 93021 invoked by uid 500); 12 Sep 2017 07:03:44 -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 93010 invoked by uid 99); 12 Sep 2017 07:03:44 -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; Tue, 12 Sep 2017 07:03:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1B31F566E; Tue, 12 Sep 2017 07:03:43 +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 Message-Id: <863b470d097d492881773236879604c7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: CAMEL-11769: Allow -starter to be compiled with SB1 and SB2 Date: Tue, 12 Sep 2017 07:03:43 +0000 (UTC) archived-at: Tue, 12 Sep 2017 07:03:45 -0000 Repository: camel Updated Branches: refs/heads/master e201f1235 -> 91bf7bf1e CAMEL-11769: Allow -starter to be compiled with SB1 and SB2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91bf7bf1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91bf7bf1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91bf7bf1 Branch: refs/heads/master Commit: 91bf7bf1efc479717374bf169d3b9cff8dd3d941 Parents: e201f12 Author: Claus Ibsen Authored: Mon Sep 11 15:23:02 2017 +0200 Committer: Claus Ibsen Committed: Tue Sep 12 08:20:24 2017 +0200 ---------------------------------------------------------------------- .../springboot/test/HystrixMappingAutoConfigurationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/91bf7bf1/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java b/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java index c13a15b..35f23ab 100644 --- a/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java +++ b/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java @@ -29,8 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -50,7 +50,7 @@ public class HystrixMappingAutoConfigurationTest { private static final Logger LOG = LoggerFactory.getLogger(HystrixMappingAutoConfigurationTest.class); - @LocalServerPort + @Value("${local.server.port}") private int serverPort; @Test