Repository: oozie Updated Branches: refs/heads/master e5b0922d8 -> 4ef1fa443
OOZIE-2191 Upgrade jackson version for hadoop-2 profile (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/4ef1fa44 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/4ef1fa44 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/4ef1fa44 Branch: refs/heads/master Commit: 4ef1fa44310287b94bf0ae20a1f091bce94597e9 Parents: e5b0922 Author: egashira <[email protected]> Authored: Thu Apr 2 13:49:57 2015 -0700 Committer: egashira <[email protected]> Committed: Thu Apr 2 13:49:57 2015 -0700 ---------------------------------------------------------------------- pom.xml | 7 +++++-- release-log.txt | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/4ef1fa44/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4cac86e..532b155 100644 --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,7 @@ <openjpa.version>2.2.2</openjpa.version> <xerces.version>2.10.0</xerces.version> <curator.version>2.5.0</curator.version> + <jackson.version>1.8.8</jackson.version> </properties> <modules> @@ -302,13 +303,13 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.8.8</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.8.8</version> + <version>${jackson.version}</version> </dependency> <!-- core --> @@ -1790,6 +1791,7 @@ <hadoop.majorversion>2</hadoop.majorversion> <pig.classifier>h2</pig.classifier> <sqoop.classifier>hadoop200</sqoop.classifier> + <jackson.version>1.9.13</jackson.version> </properties> </profile> <profile> @@ -1802,6 +1804,7 @@ <hadoop.majorversion>3</hadoop.majorversion> <pig.classifier>h2</pig.classifier> <sqoop.classifier>hadoop200</sqoop.classifier> + <jackson.version>1.9.13</jackson.version> </properties> </profile> <profile> http://git-wip-us.apache.org/repos/asf/oozie/blob/4ef1fa44/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a874447..3c1eca5 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2191 Upgrade jackson version for hadoop-2 profile (ryota) OOZIE-2183 provide an option to disable cleanup for output dataset in rerun (ryota) OOZIE-2146 Add option to filter sla information by bundle id or name (ryota) OOZIE-2188 Fix typos in twiki documentation ( jacobtolar via puru)
