evenisse 2003/07/02 03:24:14
Modified: src/plugins-build/javadoc plugin.properties project.xml
src/plugins-build/javadoc/xdocs changes.xml
src/plugins-build/jxr plugin.properties project.xml
src/plugins-build/jxr/xdocs changes.xml
Log:
Fix Maven-428. Used maven.docs.dest
Revision Changes Path
1.4 +1 -1 maven/src/plugins-build/javadoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 4 Mar 2003 02:27:54 -0000 1.3
+++ plugin.properties 2 Jul 2003 10:24:05 -0000 1.4
@@ -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=
1.11 +10 -1 maven/src/plugins-build/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 9 Apr 2003 01:06:46 -0000 1.10
+++ project.xml 2 Jul 2003 10:24:05 -0000 1.11
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-javadoc-plugin</id>
<name>Maven Javadoc Plug-in</name>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Java Project Management Tools</shortDescription>
<url>http://maven.apache.org/reference/plugins/javadoc/</url>
@@ -15,6 +15,15 @@
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/javadoc/</url>
</repository>
<developers>
+ <developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
<developer>
<name>dIon Gillard</name>
<id>dion</id>
1.3 +7 -1 maven/src/plugins-build/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 21 Mar 2003 14:51:06 -0000 1.2
+++ changes.xml 2 Jul 2003 10:24:06 -0000 1.3
@@ -3,10 +3,16 @@
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
+ <author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.2" date="in CVS">
+ <release version="1.3" date="in CVS">
+ <action dev="evenisse" type="fix">
+ Fix Maven-428. Used maven.docs.dest
+ </action>
+ </release>
+ <release version="1.2" date="Unknown">
<action dev="evenisse" type="add">
Added a custom tags support. This option is only available with Java 1.4.
</action>
1.5 +2 -2 maven/src/plugins-build/jxr/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 5 Feb 2003 11:37:17 -0000 1.4
+++ plugin.properties 2 Jul 2003 10:24:06 -0000 1.5
@@ -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
1.13 +10 -1 maven/src/plugins-build/jxr/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 9 Apr 2003 01:06:47 -0000 1.12
+++ project.xml 2 Jul 2003 10:24:06 -0000 1.13
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-jxr-plugin</id>
<name>Maven JXR Plug-in</name>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>1.2-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Java Project Management Tools</shortDescription>
<url>http://maven.apache.org/reference/plugins/jxr/</url>
@@ -15,6 +15,15 @@
<url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jxr/</url>
</repository>
<developers>
+ <developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Fi System</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
<developer>
<name>dIon Gillard</name>
<id>dion</id>
1.2 +7 -1 maven/src/plugins-build/jxr/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 25 Jan 2003 10:04:24 -0000 1.1
+++ changes.xml 2 Jul 2003 10:24:14 -0000 1.2
@@ -3,10 +3,16 @@
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
+ <author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.1" date="in CVS">
+ <release version="1.2" date="in CVS">
+ <action dev="evenisse" type="fix">
+ Fix Maven-428. Used maven.docs.dest
+ </action>
+ </release>
+ <release version="1.1" date="Unknown">
<action dev="evenisse" type="fix">
Fix for bug Maven-178.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]