Repository: oozie Updated Branches: refs/heads/master 086945b0b -> ccccd66a2
OOZIE-2177 Parameterize javadoc plugin configuration (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/ccccd66a Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/ccccd66a Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/ccccd66a Branch: refs/heads/master Commit: ccccd66a24fdca02823024e86b5bfd887c704361 Parents: 086945b Author: egashira <[email protected]> Authored: Fri Mar 20 16:47:43 2015 -0700 Committer: egashira <[email protected]> Committed: Fri Mar 20 16:47:43 2015 -0700 ---------------------------------------------------------------------- pom.xml | 4 ++++ release-log.txt | 1 + 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/ccccd66a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3e54436..29ee081 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,7 @@ <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <maven.test.java.opts>-Xmx1024m -da -XX:MaxPermSize=512m</maven.test.java.opts> + <maven.javadoc.opts></maven.javadoc.opts> <oozie.data.dir>${oozie.test.dir}</oozie.data.dir> <oozie.test.db.host>localhost</oozie.test.db.host> @@ -1488,6 +1489,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.7</version> + <configuration> + <additionalparam>${maven.javadoc.opts}</additionalparam> + </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/ccccd66a/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index dee51ab..4c3d4f9 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2177 Parameterize javadoc plugin configuration (ryota) OOZIE-2169 Fix return type for fs:dirSize, fs:fileSize and fs:blockSize in WF spec (apivovarov via puru) OOZIE-2171 Some error code messages are not parsed correctly due to unescaped single quote (rkanter) OOZIE-2108 bulk kill, suspend, resume jobs using existing filter, offset, len, and jobtype params (bzhang)
