[camel] branch master updated (d5020be -> 6bfc792)

[da...@apache.org]

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

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


    from d5020be  Add an option to set the default application.properties location as weel as disabling it
     add 6bfc792  Deprecate SpringRouteBuilder in favour of just default route builder.

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/camel/spring/SpringRouteBuilder.java  |  3 +++
 .../camel/component/properties/route/SpringSimpleRoute.java    |  4 ++--
 .../component/properties/route2/SpringBeanInjectRoute.java     |  4 ++--
 .../component/properties/route2/SpringPropertyInjectRoute.java |  4 ++--
 .../apache/camel/spring/config/MyDependsOnRouteBuilder.java    |  6 +++---
 .../apache/camel/spring/contextscan/normalorder/BarRoute.java  |  4 ++--
 .../apache/camel/spring/contextscan/normalorder/FooRoute.java  |  4 ++--
 .../camel/spring/contextscan/reverseorder/AFooRoute.java       |  4 ++--
 .../camel/spring/contextscan/reverseorder/ZBarRoute.java       |  4 ++--
 .../org/apache/camel/spring/interceptor/AnnotatedRoute.java    |  4 ++--
 .../spring/interceptor/MixedPropagationTransactedTest.java     |  3 +--
 .../spring/interceptor/MixedTransactionPropagationTest.java    |  3 +--
 .../interceptor/TransactedInterceptSendToEndpointTest.java     |  3 +--
 .../TransactedInterceptUsingAdviceWithSendToEndpointTest.java  |  3 +--
 .../interceptor/TransactionalClientDataSourceAsyncTest.java    | 10 ++++++----
 .../org/apache/camel/spring/issues/contextscan/MyRoute.java    |  4 ++--
 .../spring/postprocessor/MyRouteBuilderWithAutowiredPojo.java  |  4 ++--
 .../org/apache/camel/spring/routebuilder/MyOtherRoute.java     |  4 ++--
 .../java/org/apache/camel/spring/routebuilder/MyRoute.java     |  4 ++--
 19 files changed, 40 insertions(+), 39 deletions(-)