From commits-return-2718-archive-asf-public=cust-asf.ponee.io@falcon.apache.org Mon Jan 8 05:44:32 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id C44F9180654 for ; Mon, 8 Jan 2018 05:44:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B3D94160C3D; Mon, 8 Jan 2018 04:44:32 +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 063F0160C2A for ; Mon, 8 Jan 2018 05:44:31 +0100 (CET) Received: (qmail 80833 invoked by uid 500); 8 Jan 2018 04:44:31 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 80823 invoked by uid 99); 8 Jan 2018 04:44:31 -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, 08 Jan 2018 04:44:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DEBDCDFDE6; Mon, 8 Jan 2018 04:44:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavi@apache.org To: commits@falcon.apache.org Message-Id: <5061c1e1901d481fbb8ea45d999f919f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: falcon git commit: FALCON-2319 Falcon Build failure fix for enunciate Date: Mon, 8 Jan 2018 04:44:30 +0000 (UTC) Repository: falcon Updated Branches: refs/heads/0.11 64d1dc151 -> b66e6714d FALCON-2319 Falcon Build failure fix for enunciate Author: sandeep Author: sandeep.samudrala Reviewers: @pallavi-rao Closes #393 from sandeepSamudrala/master and squashes the following commits: 9c907efdb [sandeep.samudrala] FALCON-2319. Falcon Build failure fix for enunciate b5fb5786c [sandeep.samudrala] git applyMerge branch 'master' of https://github.com/apache/falcon 575e76866 [sandeep.samudrala] Merge branch 'master' of https://github.com/apache/falcon e0ad35884 [sandeep] Merge branch 'master' of https://github.com/apache/falcon f96a084f6 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 9cf36e93f [sandeep] Merge branch 'master' of https://github.com/apache/falcon bbca081ff [sandeep] Merge branch 'master' of https://github.com/apache/falcon 48f6afaca [sandeep] Merge branch 'master' of https://github.com/apache/falcon 250cc4609 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d0393e98d [sandeep] Merge branch 'master' of https://github.com/apache/falcon a17880526 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d6dc8bfaa [sandeep] Merge branch 'master' of https://github.com/apache/falcon 1bb8d3c72 [sandeep] Merge branch 'master' of https://github.com/apache/falcon c06556623 [sandeep] reverting last line changes made 1a4dcd234 [sandeep] rebased and resolved the conflicts from master 271318b9c [sandeep] FALCON-2097. Adding UT to the new method for getting next instance time with Delay. a94d4fe07 [sandeep] rebasing from master 9e68a5783 [sandeep] FALCON-298. Feed update with replication delay creates holes (cherry picked from commit d91fc045cec264ff3f44bef6bdf33ab03ddf1c74) Signed-off-by: Pallavi Nagesha Rao Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/b66e6714 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/b66e6714 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/b66e6714 Branch: refs/heads/0.11 Commit: b66e6714d7fceb1d52bd66fe3ce8c83f749152d9 Parents: 64d1dc1 Author: sandeep Authored: Mon Jan 8 10:14:05 2018 +0530 Committer: Pallavi Nagesha Rao Committed: Mon Jan 8 10:14:23 2018 +0530 ---------------------------------------------------------------------- common/pom.xml | 2 +- prism/pom.xml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/b66e6714/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 3f03fe2..95de7c1 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -265,7 +265,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.0.2 **/log4j.xml http://git-wip-us.apache.org/repos/asf/falcon/blob/b66e6714/prism/pom.xml ---------------------------------------------------------------------- diff --git a/prism/pom.xml b/prism/pom.xml index a20d03a..5766a43 100644 --- a/prism/pom.xml +++ b/prism/pom.xml @@ -295,7 +295,14 @@ com.webcohesion.enunciate enunciate-maven-plugin - 2.1.1 + 2.6.0 + + + javax.annotation + javax.annotation-api + 1.3 + +