MAVEN-548. Move common reporting properties to defaults

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113899 13f79535-47bb-0310-9956-ffa450edef68
2003-08-29 06:27:54 +00:00
parent 27f0a67851
commit 1d6c924c9d
46 changed files with 110 additions and 69 deletions
--- a/ashkelon/plugin.jelly
+++ b/ashkelon/plugin.jelly
@@ -9,8 +9,6 @@
  
  <ant:property name="maven.linkcheck.cache" 
    value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.linkcheck.cache')}"/>
-  <ant:property name="maven.gen.docs" 
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
  
  <goal name="maven-ashkelon-plugin:register">
    <doc:registerReport 
--- a/ashkelon/project.xml
+++ b/ashkelon/project.xml
@@ -5,7 +5,7 @@
  <pomVersion>3</pomVersion>
  <id>maven-ashkelon-plugin</id>
  <name>Maven Ashkelon Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
  <description/>
  <shortDescription>Java Project Management Tools</shortDescription>
  <url>http://maven.apache.org/reference/plugins/ashkelon/</url>
--- a/ashkelon/xdocs/changes.xml
+++ b/ashkelon/xdocs/changes.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="jason@zenplex.com">Jason van Zyl</author>
+  </properties>
+
+  <body>
+    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
+    </release>
+  </body>
+</document>
+
--- a/changes/plugin.jelly
+++ b/changes/plugin.jelly
@@ -8,8 +8,6 @@
  xmlns:doc="doc">

  <goal name="maven-changes-plugin:register">
-    <ant:property name="maven.docs.src"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
    <util:file var="changes" name="${maven.docs.src}/changes.xml"/>
    <j:if test="${changes.exists()}">
      <doc:registerReport 
@@ -31,10 +29,6 @@
  <goal
    name="changes:report"
    description="Generate a changes report">
-  <j:set var="maven.docs.src"
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
-  <j:set var="maven.docs.outputencoding"
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>

  <doc:jsl
        input="${maven.docs.src}/changes.xml"
--- a/changes/xdocs/changes.xml
+++ b/changes/xdocs/changes.xml
@@ -7,6 +7,9 @@

  <body>
    <release version="1.2" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
      <action dev="evenisse" type="add">
        <a href="http://jira.codehaus.org/ViewIssue.jspa?key=MAVEN-587">Maven-587</a>.
        Add index table of release.
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -165,8 +165,6 @@

      </ant:checkstyle>
      
-      <j:set var="maven.docs.outputencoding" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
-      
      <doc:jsl
        input="${maven.build.dir}/checkstyle-raw-report.xml"
        output="checkstyle-report.xml"
--- a/checkstyle/xdocs/changes.xml
+++ b/checkstyle/xdocs/changes.xml
@@ -9,6 +9,9 @@
  <body>

    <release version="2.0" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
      <action dev="dion" type="fix">
        Add maven dependency and classes directory to classpath. This stops
        'Unable to get class information for '&lt;classname&gt;' errors.
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -77,9 +77,7 @@

 	<clover-setup initstring="${maven.clover.database.dir}/clover_coverage.db"/>
 	
-    <j:set 
-      var="cloverReportDirectory"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/clover"/>
+    <j:set var="cloverReportDirectory" value="${maven.docs.dest}/clover"/>

    <maven:addPath id="maven.dependency.classpath" refid="clover.classpath"/>

--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -8,6 +8,9 @@

  <body>
 	<release version="1.2" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
      <action dev="evenisse" type="fix">
        Fixed MAVEN-493. I register reports only if source, test,... exists.
        So, corresponding entrys in menu will appear only if reports are registered.
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -59,8 +59,7 @@
    </ant:copy>

    <!-- Copy documentation -->
-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
    <ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
      <ant:fileset dir="${docsDest}">
        <ant:include name="**"/>
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -7,6 +7,9 @@

  <body>
    <release version="1.3" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
      <action dev="dion" type="update">
        update to commons-lang 1.0.1
      </action>
--- a/docbook/plugin.jelly
+++ b/docbook/plugin.jelly
@@ -11,8 +11,7 @@
    prereqs="xdoc:init"
    description="Transform any docbook-simple source into xdocs for later use">

-    <j:set var="genDocs"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+    <j:set var="genDocs" value="${maven.gen.docs}"/>

    ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
    <j:set var="dtd" value="${maven.docbook.dtd}"/>
--- a/docbook/xdocs/changes.xml
+++ b/docbook/xdocs/changes.xml
@@ -7,6 +7,9 @@

  <body>
    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
      <action dev="dion" type="update">
        update to xalan 2.4.1
      </action>
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -47,7 +47,7 @@
    <util:file var="destfileFile" name="${destfile}"/>
    <j:set var="destfile" value="${destfileFile.canonicalPath}"/>
        
-    <j:set var="outputencoding" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
+    <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>

    <util:available file="${srcfile}">
      <j:set var="srcFileExists" value="true" />
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -5,7 +5,7 @@
  <pomVersion>3</pomVersion>
  <id>maven-faq-plugin</id>
  <name>Maven FAQ Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
  <!-- Gump integration -->

  <gumpRepositoryId>jakarta</gumpRepositoryId>
--- a/faq/xdocs/changes.xml
+++ b/faq/xdocs/changes.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="dion@apache.org">dIon Gillard</author>
+  </properties>
+
+  <body>
+    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
+    </release>
+  </body>
+</document>
+
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -193,7 +193,7 @@
      </ant:javadoc>
      <ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />

-      <j:set var="genDocs" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}" />
+      <j:set var="genDocs" value="${maven.gen.docs}" />
      <doc:text-xdoc
        title="Javadoc Report"
        section="Javadoc Report"
--- a/javadoc/plugin.properties
+++ b/javadoc/plugin.properties
@@ -5,7 +5,7 @@
 # -------------------------------------------------------------------

 maven.javadoc.author = true
-maven.javadoc.destdir = ${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/apidocs
+maven.javadoc.destdir = ${maven.docs.dest}/apidocs

 # optional properties for specifying a custom doclet
 #maven.javadoc.docletpath=
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -8,6 +8,9 @@

  <body>
    <release version="1.3" date="in CVS">
+      <action dev="dion" type="update">
+        update to use maven.docs.*/maven.gen.docs
+      </action>
      <action dev="dion" type="update">
        update to commons-lang 1.0.1
      </action>
--- a/jdiff/plugin.jelly
+++ b/jdiff/plugin.jelly
@@ -15,8 +15,7 @@
    <ant:property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
    <ant:mkdir dir="${maven.jdiff.dir}"/>

-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
    <j:set var="javadocDestdir"
      value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
      
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -5,7 +5,7 @@
  <pomVersion>3</pomVersion>
  <id>maven-jdiff-plugin</id>
  <name>Maven JDiff Plugin</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
  <description/>
  <shortDescription>Java Project Management Tools</shortDescription>
  <url>http://maven.apache.org/reference/plugins/jdiff/</url>
--- a/jdiff/xdocs/changes.xml
+++ b/jdiff/xdocs/changes.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="dion@multitask.com.au">dIon Gillard</author>
+    <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
+  </properties>
+
+  <body>
+    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
+    </release>
+  </body>
+</document>
+
--- a/jellydoc/plugin.jelly
+++ b/jellydoc/plugin.jelly
@@ -88,8 +88,7 @@
  <!-- sets the classpath used for doclet invocations -->
  <goal name="jellydoc:init">

-    <j:set var="genDocs"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+    <j:set var="genDocs" value="${maven.gen.docs}"/>

    <!-- just in case this is ran before a compile -->
    <ant:mkdir dir="${genDocs}"/>
--- a/jellydoc/xdocs/changes.xml
+++ b/jellydoc/xdocs/changes.xml
@@ -9,6 +9,7 @@
  <body>

    <release version="1.1" date="In CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
      <action dev="dion" type="update">
        Upgrade to dom4j 1.4
      </action>
--- a/jxr/plugin.properties
+++ b/jxr/plugin.properties
@@ -4,8 +4,8 @@
 # JXR Plugin.
 # -------------------------------------------------------------------

-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.destdir = ${maven.docs.dest}/xref
+maven.jxr.destdir.test = ${maven.docs.dest}/xref-test

 maven.jxr.stylesheet = ${plugin.resources}/stylesheet.css
 maven.jxr.templateDir = ${plugin.resources}/templates
--- a/jxr/xdocs/changes.xml
+++ b/jxr/xdocs/changes.xml
@@ -8,6 +8,7 @@

  <body>
    <release version="1.2" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
      <action dev="dion" type="update">
        Move to oro 2.0.7
      </action>
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@@ -72,8 +72,7 @@
    description="Generate a xml file from your license file">

      <j:set var="licenseFile"><license:fileName /></j:set>
-      <j:set var="genDocs" 
-        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+      <j:set var="genDocs" value="${maven.gen.docs}"/>

      <util:available file="${licenseFile}">
        <j:set var="licensePresent" value="true"/>
--- a/license/xdocs/changes.xml
+++ b/license/xdocs/changes.xml
@@ -7,6 +7,7 @@

  <body>
 	<release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
      <action dev="evenisse" type="fix">
        Fixed MAVEN-493. I register reports only if source, test,... exists.
        So, corresponding entrys in menu will appear only if reports are registered.
--- a/linkcheck/plugin.jelly
+++ b/linkcheck/plugin.jelly
@@ -7,7 +7,6 @@
  xmlns:doc="doc">
  
  <property name="maven.linkcheck.cache" value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.linkcheck.cache')}"/>
-  <property name="maven.gen.docs" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
  
  <goal name="maven-linkcheck-plugin:register">
    <doc:registerReport 
@@ -50,6 +49,7 @@
    
    <j:if test="${online.trim().length() > 0}">
      <j:forEach var="report" items="${reports}">
+      <!-- FIXME: Why special case linkcheck - fix it! -->
       <j:if test="${report.get('pluginName').equals('maven-linkcheck-plugin')}">
       <attainGoal name="maven-linkcheck-plugin:report-real"/>
       </j:if>
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@@ -8,6 +8,7 @@
  <body>

 	<release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
      <action dev="dion" type="update">
        Upgrade to dom4j 1.4
      </action>
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -8,11 +8,6 @@
  xmlns:util="jelly:util"
  xmlns:velocity="jelly:velocity">

-  <j:set var="maven.gen.docs" 
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
-  <j:set var="maven.docs.dest" 
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
-
  <!--==================================================================-->
  <!-- Default goal: builds sites for all subprojects                   -->
  <!--==================================================================-->    
@@ -120,8 +115,6 @@
        template="navigation-${navType}.xml"/>
    </j:if>

-    <j:set var="maven.docs.src"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}" />
    <j:set var="userNav" value="${maven.docs.src}/navigation.xml" />

    <!-- FIXME: Will the xdoc stuff screw this up?? -->
--- a/multiproject/xdocs/current/changes.xml
+++ b/multiproject/xdocs/current/changes.xml
@@ -7,6 +7,7 @@

  <body>
    <release version="1.1" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
    </release>
    
    <release version="1.0" date="2003-08-28">
--- a/pdf/plugin.jelly
+++ b/pdf/plugin.jelly
@@ -6,10 +6,8 @@
    name="pdf:init"
    prereqs="xdoc:init">

-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
-    <j:set var="docsSrc"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
+    <j:set var="docsSrc" value="${maven.docs.src}"/>

  </goal>

--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -5,7 +5,7 @@
  <pomVersion>3</pomVersion>
  <id>maven-pdf-plugin</id>
  <name>Maven PDF 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/pdf/</url>
--- a/pdf/xdocs/changes.xml
+++ b/pdf/xdocs/changes.xml
@@ -6,7 +6,11 @@
  </properties>

  <body>
-    <release version="1.1" date="in CVS">
+    <release version="1.2" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
+    </release>
+
+    <release version="1.1" date="Unknown">
      <action dev="dion" type="add">
        Upgraded to xerces 2.3.0, xalan 2.4.1 and fop 0.20.5rc2
      </action>
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -11,8 +11,7 @@
  <goal name="site:generate" prereqs="site"/>

  <goal name="site:init" prereqs="xdoc:init">
-    <j:set var="docsDest"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+    <j:set var="docsDest" value="${maven.docs.dest}"/>
  </goal>
  
  
--- a/site/xdocs/changes.xml
+++ b/site/xdocs/changes.xml
@@ -7,6 +7,7 @@

  <body>
    <release version="1.3" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
      <action dev="dion" type="update">
        update to commons-lang 1.0.1
      </action>
--- a/statcvs/plugin.jelly
+++ b/statcvs/plugin.jelly
@@ -56,7 +56,6 @@
        <!-- FIXME : We must use, with cvs, the connection string define in project.xml -->
        <cvs command="-q log" output="${statcvs.logfile}"/>

-        <property name="maven.docs.dest" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
        <ant:mkdir dir="${maven.docs.dest}"/>
  
        <java jar="${plugin.getDependencyPath('statcvs')}" fork="true">
--- a/statcvs/xdocs/changes.xml
+++ b/statcvs/xdocs/changes.xml
@@ -7,6 +7,7 @@

  <body>
 	<release version="1.2" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
      <action dev="evenisse" type="fix" due-to="Alwyn Schoeman">
        Fixed MAVEN-561. Creates maven.build.dir and maven.docs.dest directory if doesn't exist.
      </action>
--- a/tasklist/plugin.jelly
+++ b/tasklist/plugin.jelly
@@ -32,10 +32,8 @@
    prereqs="xdoc:init"
    description="Generate a list of tasks from @todo tags in your code">

-    <j:set var="genDocs"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
-    <j:set var="encoding"
-      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
+    <j:set var="genDocs"  value="${maven.gen.docs}"/>
+    <j:set var="encoding" value="${maven.docs.outputencoding}"/>

    <j:set var="taskTag" value="${maven.tasklist.taskTag}"/>

--- a/tasklist/xdocs/changes.xml
+++ b/tasklist/xdocs/changes.xml
@@ -9,6 +9,7 @@
  <body>

    <release version="2.2" date="In CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
      <action dev="evenisse" type="fix">
        Fixed MAVEN-493. I register reports only if source, test,... exists.
        So, corresponding entrys in menu will appear only if reports are registered.
--- a/word2html/plugin.jelly
+++ b/word2html/plugin.jelly
@@ -28,8 +28,7 @@
        </fileset>
      </fileScanner>

-      <j:set var="docsDest"
-        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+      <j:set var="docsDest" value="${maven.docs.dest}"/>

      <j:forEach var="file" items="${wordFiles.iterator()}">
        <echo>Generating from ${file} to ${docsDest}</echo>
--- a/word2html/xdocs/current/changes.xml
+++ b/word2html/xdocs/current/changes.xml
@@ -7,6 +7,10 @@

  <body>

+    <release version="1.4" date="in CVS">
+      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
+    </release>
+    
    <release version="1.3" date="2003-08-28">
      <action dev="dion" type="fix">
        Correctly handle files with <code>..</code> in the names
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -139,23 +139,17 @@
      
      -->
      <j:if test="${outputDirectory == null}">
-        <j:set 
-          var="outputDirectory" 
-          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"
+        <j:set var="outputDirectory"  value="${maven.gen.docs}"
        />
      </j:if>

      <!-- Set default encoding if not set. -->
      <j:if test="${encoding == null}">
-        <j:set 
-          var="encoding" 
-          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"
-        />
+        <j:set var="encoding" value="${maven.docs.outputencoding}" />
      </j:if>
      
      <j:if test="${omitXmlDeclaration == null}">
-        <j:set var="omitXmlDeclaration" 
-          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.omitXmlDeclaration')}"/>
+        <j:set var="omitXmlDeclaration" value="${maven.docs.omitXmlDeclaration}"/>
      </j:if>
      
      <mkdir dir="${outputDirectory}"/>
--- a/xdoc/plugin.properties
+++ b/xdoc/plugin.properties
@@ -4,12 +4,6 @@
 # Xdoc plugin.
 # -------------------------------------------------------------------

-maven.docs.src = ${basedir}/xdocs
-maven.docs.dest = ${maven.build.dir}/docs
-maven.docs.outputencoding = ISO-8859-1
-maven.docs.omitXmlDeclaration=false
-maven.gen.docs = ${maven.build.dir}/generated-xdocs
-
 maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
 maven.xdoc.includeProjectDocumentation = yes

--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -7,6 +7,9 @@

  <body>
    <release version="1.4" date="in CVS">
+      <action dev='dion' type='fix'>
+        Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc plugin
+      </action>
      <action dev="evenisse" type="fix">
        Fix for MAVEN-698. Fix the broken build if repository/connection is not present.
      </action>