Repository: oozie Updated Branches: refs/heads/master 21761f5b5 -> 6121dc0cd
OOZIE-2917 duplicate declaration warning for io.dropwizard.metrics:metrics-core (Artem Ervits via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6121dc0c Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6121dc0c Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6121dc0c Branch: refs/heads/master Commit: 6121dc0cd19c3f7d2f4412922cffd1ff47e6f756 Parents: 21761f5 Author: Gezapeti Cseh <[email protected]> Authored: Mon May 29 13:20:03 2017 +0200 Committer: Gezapeti Cseh <[email protected]> Committed: Mon May 29 13:20:03 2017 +0200 ---------------------------------------------------------------------- core/pom.xml | 31 +++++++++++++------------------ release-log.txt | 1 + 2 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6121dc0c/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index e48dcd9..f53d8be 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -50,6 +50,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> + <scope>compile</scope> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -75,6 +76,18 @@ </dependency> <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-jvm</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-json</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>info.ganglia.gmetric4j</groupId> <artifactId>gmetric4j</artifactId> <exclusions> @@ -428,24 +441,6 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-jvm</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-json</artifactId> - <scope>compile</scope> - </dependency> - <!-- For drawing runtime DAG --> <dependency> <groupId>net.sf.jung</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/6121dc0c/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 8964944..983f646 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2917 duplicate declaration warning for io.dropwizard.metrics:metrics-core (Artem Ervits via gezapeti) OOZIE-1770 Create Oozie Application Master for YARN (pbacsko, rkanter, gezapeti) OOZIE-2316 Drop support for Hadoop 1 and 0.23 (asasvari) OOZIE-2908 Fix typo in oozie.actions.null.args.allowed property in oozie-default.xml (gezapeti)
