[camel] branch master updated: CAMEL-13708, CAMEL-13721, CAMEL-13694, CAMEL-13720: Fixed compile after little code change

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 5934865  CAMEL-13708, CAMEL-13721, CAMEL-13694, CAMEL-13720: Fixed 
compile after little code change
5934865 is described below

commit 593486554c11e69e79c43b1eef2cecb140747f4e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jul 5 05:14:40 2019 +0200

    CAMEL-13708, CAMEL-13721, CAMEL-13694, CAMEL-13720: Fixed compile after 
little code change
---
 .../camel/test/spring/CamelSpringPropertiesLocationElementTest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java
 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java
index c5f10c6..13389e5 100644
--- 
a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java
+++ 
b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringPropertiesLocationElementTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.component.properties.PropertiesLocation;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +55,7 @@ public class CamelSpringPropertiesLocationElementTest {
         PropertiesComponent pc = context.getComponent("properties", 
PropertiesComponent.class);
         assertNotNull("Properties component not defined", pc);
 
-        List<PropertiesLocation> locations = pc.getLocations();
+        List<String> locations = pc.getLocations();
 
         assertNotNull(locations);
         assertEquals("Properties locations", 4, locations.size());