You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/01/09 14:59:37 UTC
[2/4] camel git commit: Merge remote-tracking branch
'upstream/camel-2.18.x' into camel-2.18.x
Merge remote-tracking branch 'upstream/camel-2.18.x' into camel-2.18.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/76444ac7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/76444ac7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/76444ac7
Branch: refs/heads/camel-2.18.x
Commit: 76444ac7ae981586ab9730651a9aed9b3b373644
Parents: 18fe832 5eb6868
Author: marcusmesserkewill <ma...@kewill.com>
Authored: Mon Jan 9 15:13:08 2017 +0100
Committer: marcusmesserkewill <ma...@kewill.com>
Committed: Mon Jan 9 15:13:08 2017 +0100
----------------------------------------------------------------------
.../simple/ast/SimpleFunctionStart.java | 13 +++++-
.../camel/language/simple/SimpleTest.java | 13 ++++++
.../kafka/embedded/EmbeddedKafkaCluster.java | 3 +-
.../component/kafka/embedded/SystemTime.java | 7 ++++
.../component/sjms/batch/SjmsBatchConsumer.java | 4 +-
.../src/main/docs/swagger-java.adoc | 2 +-
.../apache/camel/swagger/RestSwaggerReader.java | 2 +-
parent/pom.xml | 10 ++---
.../org/apache/camel/catalog/CamelCatalog.java | 16 ++++++++
.../camel/catalog/DefaultCamelCatalog.java | 30 ++++++++++++--
.../camel/catalog/EndpointValidationResult.java | 43 ++++++++++++++++++++
.../apache/camel/catalog/JSonSchemaHelper.java | 34 ++++++++++++++++
.../apache/camel/catalog/CamelCatalogTest.java | 26 ++++++++++++
13 files changed, 189 insertions(+), 14 deletions(-)
----------------------------------------------------------------------