Repository: incubator-myriad
Updated Branches:
refs/heads/master 0ba2288a6 -> f5e7406f8
MYRIAD-80 Resolvedependency conflicts
The Yarn lib directory contains jars that have different versions
than what appears in the myriad build/libs directory. This causes
multiple versions of libraries to be in the yarn/libs directory
if you blindly copy jars from the build directory.
JIRA:
[MYRIAD-80] https://issues.apache.org/jira/browse/MYRIAD-80
Pull Request:
Closes #105
Author: jpgilaberte <jpgilabe...@stratio.com>
Date: Sat Feb 3 09:42:48 2018 +0100
Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/f5e7406f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/f5e7406f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/f5e7406f
Branch: refs/heads/master
Commit: f5e7406f86cde3723066f390fd4efae976aff38b
Parents: 0ba2288
Author: jpgilaberte <jpgilabe...@stratio.com>
Authored: Sat Feb 3 09:42:48 2018 +0100
Committer: Javi Roman <javiro...@apache.org>
Committed: Sat Apr 21 13:20:48 2018 +0200
----------------------------------------------------------------------
myriad-executor/build.gradle | 4 +++-
myriad-scheduler/build.gradle | 32 ++++++++++++++++++--------------
2 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/f5e7406f/myriad-executor/build.gradle
----------------------------------------------------------------------
diff --git a/myriad-executor/build.gradle b/myriad-executor/build.gradle
index 05594d7..0a44e25 100644
--- a/myriad-executor/build.gradle
+++ b/myriad-executor/build.gradle
@@ -21,6 +21,8 @@ dependencies {
compile 'org.slf4j:slf4j-log4j12:1.7.7'
compile "org.apache.hadoop:hadoop-yarn-api:${hadoopVer}"
- compile "org.apache.hadoop:hadoop-common:${hadoopVer}"
+ compile ("org.apache.hadoop:hadoop-common:${hadoopVer}"){
+ exclude group: "com.google.guava"
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/f5e7406f/myriad-scheduler/build.gradle
----------------------------------------------------------------------
diff --git a/myriad-scheduler/build.gradle b/myriad-scheduler/build.gradle
index 3e88c03..0b5b566 100644
--- a/myriad-scheduler/build.gradle
+++ b/myriad-scheduler/build.gradle
@@ -23,20 +23,24 @@
dependencies {
compile project(':myriad-commons')
- compile "org.apache.hadoop:hadoop-common:${hadoopVer}"
- compile "org.apache.hadoop:hadoop-yarn-common:${hadoopVer}"
- compile "org.apache.hadoop:hadoop-yarn-server-resourcemanager:${hadoopVer}"
- compile "com.lmax:disruptor:3.3.0"
- compile "io.dropwizard.metrics:metrics-core:${metricsVer}"
- compile "io.dropwizard.metrics:metrics-annotation:${metricsVer}"
- compile "io.dropwizard.metrics:metrics-healthchecks:${metricsVer}"
- compile "org.hibernate:hibernate-validator:5.1.2.Final"
- compile "com.fasterxml.jackson.core:jackson-annotations:2.5.1"
- compile "com.fasterxml.jackson.core:jackson-databind:2.5.1"
- compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.5.1"
- compile "org.apache.curator:curator-framework:2.7.1"
- compile "org.apache.commons:commons-lang3:3.4"
- compile 'com.google.inject.extensions:guice-multibindings:3.0'
+ compile ("org.apache.hadoop:hadoop-common:${hadoopVer}") {
+ exclude group: "com.google.guava"
+ }
+ compile ("org.apache.hadoop:hadoop-yarn-common:${hadoopVer}")
+ compile
("org.apache.hadoop:hadoop-yarn-server-resourcemanager:${hadoopVer}")
+ compile ("com.lmax:disruptor:3.3.0")
+ compile ("io.dropwizard.metrics:metrics-core:${metricsVer}")
+ compile ("io.dropwizard.metrics:metrics-annotation:${metricsVer}")
+ compile ("io.dropwizard.metrics:metrics-healthchecks:${metricsVer}")
+ compile ("org.hibernate:hibernate-validator:5.1.2.Final")
+ compile ("com.fasterxml.jackson.core:jackson-annotations:2.5.1")
+ compile ("com.fasterxml.jackson.core:jackson-databind:2.5.1")
+ compile ("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.5.1")
+ compile ("org.apache.curator:curator-framework:2.7.1"){
+ exclude group: "com.google.guava"
+ }
+ compile ("org.apache.commons:commons-lang3:3.4")
+ compile ('com.google.inject.extensions:guice-multibindings:3.0')
testCompile
"org.apache.hadoop:hadoop-yarn-server-resourcemanager:${hadoopVer}:tests"
}
