diff --git a/ashkelon/plugin.jelly b/ashkelon/plugin.jelly
index 0fc759d9..89396433 100644
--- a/ashkelon/plugin.jelly
+++ b/ashkelon/plugin.jelly
@@ -9,8 +9,6 @@
-
3
maven-ashkelon-plugin
Maven Ashkelon Plug-in
- 1.0
+ 1.1-SNAPSHOT
Java Project Management Tools
http://maven.apache.org/reference/plugins/ashkelon/
diff --git a/ashkelon/xdocs/changes.xml b/ashkelon/xdocs/changes.xml
new file mode 100644
index 00000000..fd778bf4
--- /dev/null
+++ b/ashkelon/xdocs/changes.xml
@@ -0,0 +1,16 @@
+
+
+
+ Changes
+ Jason van Zyl
+
+
+
+
+
+ update to use maven.docs.*/maven.gen.docs
+
+
+
+
+
diff --git a/changes/plugin.jelly b/changes/plugin.jelly
index 79c21b7d..a4d5cd0c 100644
--- a/changes/plugin.jelly
+++ b/changes/plugin.jelly
@@ -8,8 +8,6 @@
xmlns:doc="doc">
-
-
-
+
+ update to use maven.docs.*/maven.gen.docs
+
Maven-587.
Add index table of release.
diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly
index 4b5467c7..fe03e031 100644
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -165,8 +165,6 @@
-
-
+
+ update to use maven.docs.*/maven.gen.docs
+
Add maven dependency and classes directory to classpath. This stops
'Unable to get class information for '<classname>' errors.
diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 3a37c08d..427fd2fe 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -77,9 +77,7 @@
-
+
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index d1023230..66000e82 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -8,6 +8,9 @@
+
+ update to use maven.docs.*/maven.gen.docs
+
Fixed MAVEN-493. I register reports only if source, test,... exists.
So, corresponding entrys in menu will appear only if reports are registered.
diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index e46c1a93..091f85a2 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -59,8 +59,7 @@
-
+
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index ad7716aa..b578bebe 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -7,6 +7,9 @@
+
+ update to use maven.docs.*/maven.gen.docs
+
update to commons-lang 1.0.1
diff --git a/docbook/plugin.jelly b/docbook/plugin.jelly
index f55cbcd0..058a869e 100644
--- 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">
-
+
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
diff --git a/docbook/xdocs/changes.xml b/docbook/xdocs/changes.xml
index 7a918531..10f11546 100644
--- a/docbook/xdocs/changes.xml
+++ b/docbook/xdocs/changes.xml
@@ -7,6 +7,9 @@
+
+ update to use maven.docs.*/maven.gen.docs
+
update to xalan 2.4.1
diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index 96d6a332..f278cda0 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -47,7 +47,7 @@
-
+
diff --git a/faq/project.xml b/faq/project.xml
index ea6eb6a3..0f85364c 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -5,7 +5,7 @@
3
maven-faq-plugin
Maven FAQ Plug-in
- 1.0
+ 1.1-SNAPSHOT
jakarta
diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml
new file mode 100644
index 00000000..2f90af07
--- /dev/null
+++ b/faq/xdocs/changes.xml
@@ -0,0 +1,16 @@
+
+
+
+ Changes
+ dIon Gillard
+
+
+
+
+
+ update to use maven.docs.*/maven.gen.docs
+
+
+
+
+
diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 2ff3a4fc..e4966737 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -193,7 +193,7 @@
-
+
+
+ update to use maven.docs.*/maven.gen.docs
+
update to commons-lang 1.0.1
diff --git a/jdiff/plugin.jelly b/jdiff/plugin.jelly
index 2e7e5e18..2e2b269c 100644
--- a/jdiff/plugin.jelly
+++ b/jdiff/plugin.jelly
@@ -15,8 +15,7 @@
-
+
diff --git a/jdiff/project.xml b/jdiff/project.xml
index e1197ea0..78209dee 100644
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -5,7 +5,7 @@
3
maven-jdiff-plugin
Maven JDiff Plugin
- 1.0
+ 1.1-SNAPSHOT
Java Project Management Tools
http://maven.apache.org/reference/plugins/jdiff/
diff --git a/jdiff/xdocs/changes.xml b/jdiff/xdocs/changes.xml
new file mode 100644
index 00000000..1344f1d6
--- /dev/null
+++ b/jdiff/xdocs/changes.xml
@@ -0,0 +1,15 @@
+
+
+
+ Changes
+ dIon Gillard
+ Emmanuel Venisse
+
+
+
+
+ update to use maven.docs.*/maven.gen.docs
+
+
+
+
diff --git a/jellydoc/plugin.jelly b/jellydoc/plugin.jelly
index ac5cfb4b..8b8799c3 100644
--- a/jellydoc/plugin.jelly
+++ b/jellydoc/plugin.jelly
@@ -88,8 +88,7 @@
-
+
diff --git a/jellydoc/xdocs/changes.xml b/jellydoc/xdocs/changes.xml
index dbd575bb..3ca901d2 100644
--- a/jellydoc/xdocs/changes.xml
+++ b/jellydoc/xdocs/changes.xml
@@ -9,6 +9,7 @@
+ update to use maven.docs.*/maven.gen.docs
Upgrade to dom4j 1.4
diff --git a/jxr/plugin.properties b/jxr/plugin.properties
index eedff54b..3c131ee3 100644
--- 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
diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml
index 89d56a2b..6dba1456 100644
--- a/jxr/xdocs/changes.xml
+++ b/jxr/xdocs/changes.xml
@@ -8,6 +8,7 @@
+ update to use maven.docs.*/maven.gen.docs
Move to oro 2.0.7
diff --git a/license/plugin.jelly b/license/plugin.jelly
index 8a6e0804..e652edd4 100644
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@@ -72,8 +72,7 @@
description="Generate a xml file from your license file">
-
+
diff --git a/license/xdocs/changes.xml b/license/xdocs/changes.xml
index ae204576..de83e065 100644
--- a/license/xdocs/changes.xml
+++ b/license/xdocs/changes.xml
@@ -7,6 +7,7 @@
+ update to use maven.docs.*/maven.gen.docs
Fixed MAVEN-493. I register reports only if source, test,... exists.
So, corresponding entrys in menu will appear only if reports are registered.
diff --git a/linkcheck/plugin.jelly b/linkcheck/plugin.jelly
index ca66a122..bbb5a018 100644
--- a/linkcheck/plugin.jelly
+++ b/linkcheck/plugin.jelly
@@ -7,7 +7,6 @@
xmlns:doc="doc">
-
+
diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml
index d60d2209..74ce997f 100644
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@@ -8,6 +8,7 @@
+ update to use maven.docs.*/maven.gen.docs
Upgrade to dom4j 1.4
diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index fefa4ab9..264c632b 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -8,11 +8,6 @@
xmlns:util="jelly:util"
xmlns:velocity="jelly:velocity">
-
-
-
@@ -120,8 +115,6 @@
template="navigation-${navType}.xml"/>
-
diff --git a/multiproject/xdocs/current/changes.xml b/multiproject/xdocs/current/changes.xml
index e8c0b4a7..2e11d59d 100644
--- a/multiproject/xdocs/current/changes.xml
+++ b/multiproject/xdocs/current/changes.xml
@@ -7,6 +7,7 @@
+ update to use maven.docs.*/maven.gen.docs
diff --git a/pdf/plugin.jelly b/pdf/plugin.jelly
index bc591f2e..4bec4591 100644
--- a/pdf/plugin.jelly
+++ b/pdf/plugin.jelly
@@ -6,10 +6,8 @@
name="pdf:init"
prereqs="xdoc:init">
-
-
+
+
diff --git a/pdf/project.xml b/pdf/project.xml
index 6fa05da6..c63aef49 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -5,7 +5,7 @@
3
maven-pdf-plugin
Maven PDF Plug-in
- 1.1
+ 1.2-SNAPSHOT
Java Project Management Tools
http://maven.apache.org/reference/plugins/pdf/
diff --git a/pdf/xdocs/changes.xml b/pdf/xdocs/changes.xml
index 498f1fa0..9c7b1b9b 100644
--- a/pdf/xdocs/changes.xml
+++ b/pdf/xdocs/changes.xml
@@ -6,7 +6,11 @@
-
+
+ update to use maven.docs.*/maven.gen.docs
+
+
+
Upgraded to xerces 2.3.0, xalan 2.4.1 and fop 0.20.5rc2
diff --git a/site/plugin.jelly b/site/plugin.jelly
index b9acced0..0c7f7e14 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -11,8 +11,7 @@
-
+
diff --git a/site/xdocs/changes.xml b/site/xdocs/changes.xml
index bc5794e8..64b2a903 100644
--- a/site/xdocs/changes.xml
+++ b/site/xdocs/changes.xml
@@ -7,6 +7,7 @@
+ update to use maven.docs.*/maven.gen.docs
update to commons-lang 1.0.1
diff --git a/statcvs/plugin.jelly b/statcvs/plugin.jelly
index 2add830d..1d765d79 100644
--- a/statcvs/plugin.jelly
+++ b/statcvs/plugin.jelly
@@ -56,7 +56,6 @@
-
diff --git a/statcvs/xdocs/changes.xml b/statcvs/xdocs/changes.xml
index 34dcda50..8096d5ba 100644
--- a/statcvs/xdocs/changes.xml
+++ b/statcvs/xdocs/changes.xml
@@ -7,6 +7,7 @@
+ update to use maven.docs.*/maven.gen.docs
Fixed MAVEN-561. Creates maven.build.dir and maven.docs.dest directory if doesn't exist.
diff --git a/tasklist/plugin.jelly b/tasklist/plugin.jelly
index 7d79fa37..2be21f16 100644
--- 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">
-
-
+
+
diff --git a/tasklist/xdocs/changes.xml b/tasklist/xdocs/changes.xml
index 643af1da..34d31f6b 100644
--- a/tasklist/xdocs/changes.xml
+++ b/tasklist/xdocs/changes.xml
@@ -9,6 +9,7 @@
+ update to use maven.docs.*/maven.gen.docs
Fixed MAVEN-493. I register reports only if source, test,... exists.
So, corresponding entrys in menu will appear only if reports are registered.
diff --git a/word2html/plugin.jelly b/word2html/plugin.jelly
index 01512e7e..f4b16e7e 100644
--- a/word2html/plugin.jelly
+++ b/word2html/plugin.jelly
@@ -28,8 +28,7 @@
-
+
Generating from ${file} to ${docsDest}
diff --git a/word2html/xdocs/current/changes.xml b/word2html/xdocs/current/changes.xml
index 245c3588..4f123a2f 100644
--- a/word2html/xdocs/current/changes.xml
+++ b/word2html/xdocs/current/changes.xml
@@ -7,6 +7,10 @@
+
+ update to use maven.docs.*/maven.gen.docs
+
+
Correctly handle files with .. in the names
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 05cff78b..24f5b316 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -139,23 +139,17 @@
-->
-
-
+
-
+
diff --git a/xdoc/plugin.properties b/xdoc/plugin.properties
index b78f2cd1..50e40ffa 100644
--- 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
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index b160d202..4473610e 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -7,6 +7,9 @@
+
+ Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc plugin
+
Fix for MAVEN-698. Fix the broken build if repository/connection is not present.