Repository: falcon Updated Branches: refs/heads/0.11 64d1dc151 -> b66e6714d
FALCON-2319 Falcon Build failure fix for enunciate Author: sandeep <[email protected]> Author: sandeep.samudrala <[email protected]> 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 <[email protected]> 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 <[email protected]> Authored: Mon Jan 8 10:14:05 2018 +0530 Committer: Pallavi Nagesha Rao <[email protected]> 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 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>3.0.2</version> <configuration> <excludes> <exclude>**/log4j.xml</exclude> 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 @@ <plugin> <groupId>com.webcohesion.enunciate</groupId> <artifactId>enunciate-maven-plugin</artifactId> - <version>2.1.1</version> + <version>2.6.0</version> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3</version> + </dependency> + </dependencies> <executions> <execution> <goals>
