From b18183793313ca01af98848c1829a5d9c744ed57 Mon Sep 17 00:00:00 2001 From: evenisse Date: Wed, 2 Jul 2003 10:24:14 +0000 Subject: [PATCH] Fix Maven-428. Used maven.docs.dest git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113572 13f79535-47bb-0310-9956-ffa450edef68 --- javadoc/plugin.properties | 2 +- javadoc/project.xml | 11 ++++++++++- javadoc/xdocs/changes.xml | 8 +++++++- jxr/plugin.properties | 4 ++-- jxr/project.xml | 11 ++++++++++- jxr/xdocs/changes.xml | 8 +++++++- 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties index 749a75d8..8f20fcc5 100644 --- a/javadoc/plugin.properties +++ b/javadoc/plugin.properties @@ -5,7 +5,7 @@ # ------------------------------------------------------------------- maven.javadoc.author = true -maven.javadoc.destdir = ${maven.build.dir}/docs/apidocs +maven.javadoc.destdir = ${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/apidocs # optional properties for specifying a custom doclet #maven.javadoc.docletpath= diff --git a/javadoc/project.xml b/javadoc/project.xml index ab3b9092..16338b97 100644 --- a/javadoc/project.xml +++ b/javadoc/project.xml @@ -5,7 +5,7 @@ 3 maven-javadoc-plugin Maven Javadoc Plug-in - 1.2 + 1.3-SNAPSHOT Java Project Management Tools http://maven.apache.org/reference/plugins/javadoc/ @@ -15,6 +15,15 @@ http://cvs.apache.org/viewcvs/maven/src/plugins-build/javadoc/ + + Emmanuel Venisse + evenisse + evenisse@ifrance.com + Fi System + + Java Developer + + dIon Gillard dion diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml index db353ff6..e0182389 100644 --- a/javadoc/xdocs/changes.xml +++ b/javadoc/xdocs/changes.xml @@ -3,10 +3,16 @@ Changes dIon Gillard + Emmanuel Venisse - + + + Fix Maven-428. Used maven.docs.dest + + + Added a custom tags support. This option is only available with Java 1.4. diff --git a/jxr/plugin.properties b/jxr/plugin.properties index d88ac325..eedff54b 100644 --- a/jxr/plugin.properties +++ b/jxr/plugin.properties @@ -4,8 +4,8 @@ # JXR Plugin. # ------------------------------------------------------------------- -maven.jxr.destdir = ${maven.build.dir}/docs/xref -maven.jxr.destdir.test = ${maven.build.dir}/docs/xref-test +maven.jxr.destdir = ${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/xref +maven.jxr.destdir.test = ${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/xref-test maven.jxr.stylesheet = ${plugin.resources}/stylesheet.css maven.jxr.templateDir = ${plugin.resources}/templates diff --git a/jxr/project.xml b/jxr/project.xml index 924e8b0e..9e0fae47 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -5,7 +5,7 @@ 3 maven-jxr-plugin Maven JXR Plug-in - 1.1 + 1.2-SNAPSHOT Java Project Management Tools http://maven.apache.org/reference/plugins/jxr/ @@ -15,6 +15,15 @@ http://cvs.apache.org/viewcvs/maven/src/plugins-build/jxr/ + + Emmanuel Venisse + evenisse + evenisse@ifrance.com + Fi System + + Java Developer + + dIon Gillard dion diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index 4faaff81..31c759f9 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -3,10 +3,16 @@ Changes dIon Gillard + Emmanuel Venisse - + + + Fix Maven-428. Used maven.docs.dest + + + Fix for bug Maven-178.