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 92011200BF7 for ; Mon, 9 Jan 2017 15:59:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 908F5160B4C; Mon, 9 Jan 2017 14:59:37 +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 0B873160B3B for ; Mon, 9 Jan 2017 15:59:36 +0100 (CET) Received: (qmail 54567 invoked by uid 500); 9 Jan 2017 14:59:36 -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 54531 invoked by uid 99); 9 Jan 2017 14:59:36 -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; Mon, 09 Jan 2017 14:59:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10B2FDFB86; Mon, 9 Jan 2017 14:59:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acosentino@apache.org To: commits@camel.apache.org Date: Mon, 09 Jan 2017 14:59:37 -0000 Message-Id: <3ad5eb9230a54ff5a27653408d21eb65@git.apache.org> In-Reply-To: <25323cc50af94d1587732114c3ed01fd@git.apache.org> References: <25323cc50af94d1587732114c3ed01fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] camel git commit: Merge remote-tracking branch 'upstream/camel-2.18.x' into camel-2.18.x archived-at: Mon, 09 Jan 2017 14:59:37 -0000 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 Authored: Mon Jan 9 15:13:08 2017 +0100 Committer: marcusmesserkewill 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(-) ----------------------------------------------------------------------