diff options
author | witgo <witgo@qq.com> | 2014-05-14 22:26:26 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-14 22:26:34 -0700 |
commit | 31b853ce8b91742bad74380c519cfa1c08cd8a33 (patch) | |
tree | 1a667c1227bef910fe0b06a53d979859d48cc742 /sql/hive | |
parent | c02d6144a9fc0b137faad1a5c46ddb61d521b706 (diff) | |
download | spark-31b853ce8b91742bad74380c519cfa1c08cd8a33.tar.gz spark-31b853ce8b91742bad74380c519cfa1c08cd8a33.tar.bz2 spark-31b853ce8b91742bad74380c519cfa1c08cd8a33.zip |
fix different versions of commons-lang dependency and apache/spark#746 addendum
Author: witgo <witgo@qq.com>
Closes #754 from witgo/commons-lang and squashes the following commits:
3ebab31 [witgo] merge master
f3b8fa2 [witgo] merge master
2083fae [witgo] repeat definition
5599cdb [witgo] multiple version of sbt dependency
c1b66a1 [witgo] fix different versions of commons-lang dependency
(cherry picked from commit bae07e36a6e0fb7982405316646b452b4ff06acc)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'sql/hive')
-rw-r--r-- | sql/hive/pom.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 0c5565707e..c27a3c7af2 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -56,6 +56,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -75,6 +79,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> </exclusions> </dependency> <!-- hive-serde already depends on avro, but this brings in customized config of avro deps from parent --> |