Repository: oozie Updated Branches: refs/heads/master 9948829a1 -> 665ed3e0d
OOZIE-2286 Update Log4j and Log4j-extras to latest 1.2.x release (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/665ed3e0 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/665ed3e0 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/665ed3e0 Branch: refs/heads/master Commit: 665ed3e0d25f3c65415d8a9f94579dca6b59bfc4 Parents: 9948829 Author: Robert Kanter <[email protected]> Authored: Tue Jun 30 13:53:00 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Tue Jun 30 13:53:00 2015 -0700 ---------------------------------------------------------------------- pom.xml | 5 +++-- release-log.txt | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/665ed3e0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b5dcd34..455a11d 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,7 @@ <xerces.version>2.10.0</xerces.version> <curator.version>2.5.0</curator.version> <jackson.version>1.8.8</jackson.version> + <log4j.version>1.2.17</log4j.version> </properties> <modules> @@ -1185,7 +1186,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> + <version>${log4j.version}</version> <exclusions> <exclusion> <groupId>com.sun.jdmk</groupId> @@ -1213,7 +1214,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>apache-log4j-extras</artifactId> - <version>1.1</version> + <version>${log4j.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/665ed3e0/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 4fb97f8..7b85fea 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2286 Update Log4j and Log4j-extras to latest 1.2.x release (rkanter) OOZIE-2250 Show log for WAITING and TIMEDOUT coord actions (kailongs via rohini) OOZIE-2262 Fix log streaming from other server with start/end filter (kailongs via rohini) OOZIE-2159 'oozie validate' command should be moved server-side (seoeun25 via rkanter)
