Repository: incubator-zeppelin Updated Branches: refs/heads/master f04ce390f -> d690e6695
Fix the jets3t dependency according to the Hadoop version Fixes S3 support for Hadoop >= 2.3 (ZEPPELIN-111 https://issues.apache.org/jira/browse/ZEPPELIN-111) Regression from PR #88. Author: Jérémy Subtil <[email protected]> Closes #105 from jersub/fix-jets3t and squashes the following commits: 0e75073 [Jérémy Subtil] Fix the jets3t dependency according to the Hadoop version Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/d690e669 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/d690e669 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/d690e669 Branch: refs/heads/master Commit: d690e6695c435f535770db00afb90570096c3fba Parents: f04ce39 Author: Jérémy Subtil <[email protected]> Authored: Tue Jun 16 15:56:32 2015 +0200 Committer: Alexander Bezzubov <[email protected]> Committed: Wed Jun 17 10:45:18 2015 +0900 ---------------------------------------------------------------------- spark/pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d690e669/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 0475515..4610167 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -41,6 +41,7 @@ <hadoop.version>2.3.0</hadoop.version> <yarn.version>${hadoop.version}</yarn.version> + <jets3t.version>0.9.3</jets3t.version> </properties> <repositories> @@ -52,6 +53,19 @@ <dependencyManagement> <dependencies> + <!-- See SPARK-1556 for info on this dependency: --> + <dependency> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + <version>${jets3t.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> @@ -491,6 +505,7 @@ </dependencies> <properties> <hadoop.version>0.23.10</hadoop.version> + <jets3t.version>0.7.1</jets3t.version> </properties> </profile> @@ -498,6 +513,7 @@ <id>hadoop-2.2</id> <properties> <hadoop.version>2.2.0</hadoop.version> + <jets3t.version>0.7.1</jets3t.version> </properties> </profile> @@ -530,6 +546,7 @@ <properties> <hadoop.version>1.0.3-mapr-3.0.3</hadoop.version> <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version> + <jets3t.version>0.7.1</jets3t.version> </properties> </profile> @@ -541,6 +558,7 @@ <properties> <hadoop.version>2.3.0-mapr-4.0.0-FCS</hadoop.version> <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version> + <jets3t.version>0.7.1</jets3t.version> </properties> <dependencies> <dependency>
