Repository: falcon Updated Branches: refs/heads/master 4a76b11be -> 84fb86180
FALCON-1792 Upgrade hadoop.version to 2.6.2. Contributed by Venkatesan Ramachandran. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/84fb8618 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/84fb8618 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/84fb8618 Branch: refs/heads/master Commit: 84fb8618019c1dc9862f2570bb597c3b6b22ba5f Parents: 4a76b11 Author: peeyush b <[email protected]> Authored: Tue Feb 2 21:09:23 2016 +0530 Committer: peeyush b <[email protected]> Committed: Tue Feb 2 21:09:23 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ addons/designer/pom.xml | 2 +- common/pom.xml | 6 ++++++ falcon-regression/pom.xml | 2 +- pom.xml | 10 ++++++++-- 5 files changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/84fb8618/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 061171c..0028c0f 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -24,6 +24,8 @@ Trunk FALCON-1770 Update README file (Ajay Yadava) BUG FIXES + FALCON-1792 Upgrade hadoop.version to 2.6.2 (Venkatesan Ramachandran via Peeyush Bishnoi) + FALCON-1796 [HOTFIX] Incorrect parent pom in distro module(Ajay Yadava) FALCON-1779 Fix rat-check failure in trunk (Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/84fb8618/addons/designer/pom.xml ---------------------------------------------------------------------- diff --git a/addons/designer/pom.xml b/addons/designer/pom.xml index 28a977a..4be24c3 100644 --- a/addons/designer/pom.xml +++ b/addons/designer/pom.xml @@ -101,7 +101,7 @@ <jetty.version>6.1.26</jetty.version> <internal.maven.repo>file:///tmp/falcontemprepo</internal.maven.repo> <skipCheck>false</skipCheck> - <hadoop.version>2.2.0</hadoop.version> + <hadoop.version>2.6.2</hadoop.version> </properties> <modules> http://git-wip-us.apache.org/repos/asf/falcon/blob/84fb8618/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 8605358..2e01282 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -61,6 +61,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-aws</artifactId> + <version>${hadoop.version}</version> + <scope>provided</scope> + </dependency> </dependencies> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/falcon/blob/84fb8618/falcon-regression/pom.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/pom.xml b/falcon-regression/pom.xml index 6bf3d50..365a104 100644 --- a/falcon-regression/pom.xml +++ b/falcon-regression/pom.xml @@ -42,7 +42,7 @@ <oozie.version>4.1.0</oozie.version> <hive.version>1.2.1</hive.version> <hcatalog.version>1.2.1</hcatalog.version> - <hadoop.version>2.7.1</hadoop.version> + <hadoop.version>2.6.2</hadoop.version> <testng.exclude.pattern>nothing</testng.exclude.pattern> <testng.include.pattern>**/Test*.java,**/*Test.java,**/*TestCase.java</testng.include.pattern> </properties> http://git-wip-us.apache.org/repos/asf/falcon/blob/84fb8618/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3d82c13..12672bd 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <hadoop.version>2.5.0</hadoop.version> + <hadoop.version>2.6.2</hadoop.version> </properties> <dependencyManagement> <dependencies> @@ -249,6 +249,12 @@ <version>${hadoop.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-aws</artifactId> + <version>${hadoop.version}</version> + <scope>provided</scope> + </dependency> </dependencies> </dependencyManagement> </profile> @@ -555,7 +561,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.2</version> + <version>2.4</version> </dependency> <dependency>
