You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2019/08/12 19:45:30 UTC
[camel] 01/02: Merge branch 'master' of
https://github.com/apache/camel into CAMEL-13853
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 677a1284e4a69342f668cba947ada36c5da71160
Merge: c7f36cd 1b81a90
Author: Jan Bednář <ma...@janbednar.eu>
AuthorDate: Mon Aug 12 21:40:17 2019 +0200
Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853
.../camel-atmos/src/main/docs/atmos-component.adoc | 2 +-
.../camel-ftp/src/main/docs/ftp-component.adoc | 6 +-
.../docs/google-calendar-stream-component.adoc | 2 +-
.../camel-http/src/main/docs/http-component.adoc | 4 +-
.../src/main/docs/micrometer-component.adoc | 14 +-
components/camel-microprofile-config/pom.xml | 5 +
.../config/CamelMicroProfilePropertiesSource.java | 49 ++++++-
.../org/apache/camel/properties-source-factory | 2 +-
.../CamelMicroProfilePropertiesSourceTest.java | 47 +++++--
.../camel-mina/src/main/docs/mina-component.adoc | 4 +-
.../src/main/docs/properties-component.adoc | 3 +-
.../AbstractLocationPropertiesSource.java | 14 ++
.../component/properties/PropertiesComponent.java | 116 ++++++++++++++---
.../src/main/docs/quartz-component.adoc | 14 +-
.../camel-sql/src/main/docs/sql-component.adoc | 2 +-
.../apache/camel/spi/LoadablePropertiesSource.java | 9 ++
.../org/apache/camel/spi/PropertiesComponent.java | 16 ++-
.../camel-core/src/main/docs/eips/process-eip.adoc | 3 +-
.../PropertiesComponentPropertiesSourceTest.java | 145 +++++++++++++++++++++
.../camel/support/PropertyBindingSupport.java | 3 +-
.../camel/support/RestProducerFactoryHelper.java | 5 +-
.../modules/ROOT/pages/atmos-component.adoc | 12 +-
.../modules/ROOT/pages/ftp-component.adoc | 6 +-
.../pages/google-calendar-stream-component.adoc | 2 +-
.../modules/ROOT/pages/http-component.adoc | 4 +-
.../modules/ROOT/pages/micrometer-component.adoc | 14 +-
.../modules/ROOT/pages/mina-component.adoc | 4 +-
.../modules/ROOT/pages/quartz-component.adoc | 14 +-
.../modules/ROOT/pages/sql-component.adoc | 2 +-
.../modules/ROOT/pages/xmpp-component.adoc | 3 +-
.../ROOT/pages/commercial-camel-offerings.adoc | 2 +-
.../modules/ROOT/pages/content-enricher.adoc | 2 +-
.../modules/ROOT/pages/process-eip.adoc | 3 +-
.../PropertiesComponentConfiguration.java | 14 ++
34 files changed, 448 insertions(+), 99 deletions(-)