diff --git a/dashboard/src/plugin-resources/templates/dashboard.jsl b/dashboard/src/plugin-resources/templates/dashboard.jsl
index ab7294a1..63b522c2 100644
--- a/dashboard/src/plugin-resources/templates/dashboard.jsl
+++ b/dashboard/src/plugin-resources/templates/dashboard.jsl
@@ -3,7 +3,7 @@
 <!--
  * ========================================================================
  * 
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dashboard/src/plugin-test/common/project.properties b/dashboard/src/plugin-test/common/project.properties
new file mode 100644
index 00000000..b49b54e9
--- /dev/null
+++ b/dashboard/src/plugin-test/common/project.properties
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+# -------------------------------------------------------------------
+# P R O J E C T  P R O P E R T I E S
+# -------------------------------------------------------------------
+maven.xdoc.date=left
+maven.checkstyle.header.file = ${basedir}/../../../../checkstyle-license.txt
+
+# Ensure that Maven will be able to download the findbugs plugin for the
+# tests
+maven.repo.remote = http://www.ibiblio.org/maven,http://maven-plugins.sourceforge.net/repository/
+
+# Put line count at a low number so that we can get Simian-reported errors
+maven.simian.linecount = 5
+
+# Turn off these properties as we're using the multiproject plugin to 
+# generate the dashboard
+maven.dashboard.rungoals = false
+maven.dashboard.runreactor = false
+
+# Define what dashboard aggregators will be run. This property is inherited
+# by the subprojects and thus they don't need to define it again.
+maven.dashboard.aggregators = csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,fbfiles,fbviolations,jcoveragelipc,jcoverageloc,tasklistclass,tasklistmethod,tasklist,scmchangedfiles,scmchangedcommit,javancssclassestotal,javancssfunctionstotal,javancssncsstotal,javancsspackagestotal,javancssjavadocstotal
+
+# Make sure that an XML report is generated whenever Clover is run. Also
+# inherited by the subprojects.
+maven.clover.report.xml = true
+maven.junit.fork=true
diff --git a/dashboard/src/plugin-test/common/project.xml b/dashboard/src/plugin-test/common/project.xml
new file mode 100644
index 00000000..5701a855
--- /dev/null
+++ b/dashboard/src/plugin-test/common/project.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<project>
+  <pomVersion>3</pomVersion>
+  <groupId>maven</groupId>
+  <currentVersion>1.0</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://jakarta.apache.org/</url>
+  </organization>
+  <inceptionYear>2003</inceptionYear>
+  <package>org.apache.maven.dashboard.test</package>
+  <url>http://maven.apache.org/reference/plugins/dashboard/</url>
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/dashboard/</connection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/dashboard/</url>
+  </repository>
+  <mailingLists/>
+  <developers/>
+  <dependencies>
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly-tags-xml</artifactId>
+      <version>20030211.142705</version>
+      <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+    </dependency>
+    <!-- We need to be sure the findbugs plugin is downloaded for the tests -->
+    <dependency>
+      <groupId>maven-plugins</groupId>
+      <artifactId>maven-findbugs-plugin</artifactId>
+      <version>0.8.4</version>
+      <type>plugin</type>
+    </dependency>
+    <!-- We need to be sure the JavaNCSS plugin is downloaded for the tests -->
+    <dependency>
+      <groupId>maven-plugins</groupId>
+      <artifactId>maven-javancss-plugin</artifactId>
+      <version>1.3</version>
+      <type>plugin</type>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/Test*.java</include>
+      </includes>
+    </unitTest>
+  </build>
+  <reports/>
+</project>
diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml
index d4ced241..0f559287 100644
--- a/dashboard/src/plugin-test/maven.xml
+++ b/dashboard/src/plugin-test/maven.xml
@@ -1,6 +1,6 @@
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
     <!-- Setup -->
     <j:set var="goal" value="clean"/>
     <attainGoal name="multiproject:goal"/>
+    <attainGoal name="clean"/>
 
     <!-- Call goal to test -->
     <j:set var="maven.multiproject.site.goals" value="site,dashboard:report-single"/>
@@ -109,8 +110,9 @@
     <ant:echo>Check that subproject1 has a link to the checkstyle report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[2]/a/@href)"/>
     <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
-    <!-- The subproject2 don't have any report we check that there isn't any link -->
-    <ant:echo>Check that subproject2 has no link to detailed reports</ant:echo>
+    <!-- Subproject2 has no HTML report generated (there are no reports defined in subproject2's
+         project.xml): we check that the link to the report does not exist -->
+    <ant:echo>Check that subproject2 has no link to the checkstyle report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[2]/a/@href)"/>
     <assert:assertEquals expected="" value="${URL}"/>
 
diff --git a/dashboard/src/plugin-test/project.properties b/dashboard/src/plugin-test/project.properties
index b086969b..6dfa86e0 100644
--- a/dashboard/src/plugin-test/project.properties
+++ b/dashboard/src/plugin-test/project.properties
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
+# Copyright 2001-2005 The Apache Software Foundation.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,35 +14,11 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
-maven.xdoc.date=left
-maven.checkstyle.header.file = ${basedir}/../../../../checkstyle-license.txt
-
-# Ensure that Maven will be able to download the findbugs plugin for the
-# tests
-maven.repo.remote = http://www.ibiblio.org/maven,http://maven-plugins.sourceforge.net/repository/
-
-# Put line count at a low number so that we can get Simian-reported errors
-maven.simian.linecount = 5
-
 # MUST specify these, even though they are the defaults, so we can run 
 # inside reactor where they were already set.
 maven.multiproject.basedir=${basedir}
 maven.multiproject.includes=*/project.xml
-maven.multiproject.excludes=
+maven.multiproject.excludes=common/project.xml
 
-# Turn off these properties as we're using the multiproject plugin to 
-# generate the dashboard
-maven.dashboard.rungoals = false
-maven.dashboard.runreactor = false
-
-# Define what dashboard aggregators will be run. This property is inherited
-# by the subprojects and thus they don't need to define it again.
-maven.dashboard.aggregators = csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,fbfiles,fbviolations,jcoveragelipc,jcoverageloc,tasklistclass,tasklistmethod,tasklist,scmchangedfiles,scmchangedcommit,javancssclassestotal,javancssfunctionstotal,javancssncsstotal,javancsspackagestotal,javancssjavadocstotal
-
-# Make sure that an XML report is generated whenever Clover is run. Also
-# inherited by the subprojects.
-maven.clover.report.xml = true
-maven.junit.fork=true
+# Ensure we don't build common/project.xml in the dashboard report
+maven.dashboard.excludes=**/target/**/project.xml,common/project.xml
diff --git a/dashboard/src/plugin-test/project.xml b/dashboard/src/plugin-test/project.xml
index 45080230..408efd54 100644
--- a/dashboard/src/plugin-test/project.xml
+++ b/dashboard/src/plugin-test/project.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,58 +18,11 @@
  */
  -->
 
-
 <project>
-  <pomVersion>3</pomVersion>
+  <extend>${basedir}/common/project.xml</extend>
   <id>test-maven-dashboard-plugin</id>
   <name>Maven Dashboard plugin test</name>
-  <groupId>maven</groupId>
-  <currentVersion>1.0</currentVersion>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
-  </organization>
-  <inceptionYear>2003</inceptionYear>
-  <package>org.apache.maven.dashboard.test</package>
   <shortDescription>Test project for Maven Dashboard plugin</shortDescription>
-  <url>http://maven.apache.org/reference/plugins/dashboard/</url>
-  <repository>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/dashboard/</connection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/dashboard/</url>
-  </repository>
-  <mailingLists/>
-  <developers/>
-  <dependencies>
-    <dependency>
-      <groupId>commons-jelly</groupId>
-      <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>20030211.142705</version>
-      <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
-    </dependency>
-    <!-- We need to be sure the findbugs plugin is downloaded for the tests -->
-    <dependency>
-      <groupId>maven-plugins</groupId>
-      <artifactId>maven-findbugs-plugin</artifactId>
-      <version>0.8.4</version>
-      <type>plugin</type>
-    </dependency>
-    <!-- We need to be sure the JavaNCSS plugin is downloaded for the tests -->
-    <dependency>
-      <groupId>maven-plugins</groupId>
-      <artifactId>maven-javancss-plugin</artifactId>
-      <version>1.3</version>
-      <type>plugin</type>
-    </dependency>
-  </dependencies>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <unitTest>
-      <includes>
-        <include>**/Test*.java</include>
-      </includes>
-    </unitTest>
-  </build>
   <reports>
     <report>maven-dashboard-plugin</report>
   </reports>
diff --git a/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml b/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml
index 067863a2..ac808e77 100644
--- a/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml
+++ b/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
+<!-- 
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
 <document>
   <properties>
     <title>Changelog Report</title>
diff --git a/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml b/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml
index 70f120eb..018aaba0 100644
--- a/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml
+++ b/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- 
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+  
 <!-- File used to simulate some changelog being generated. We're manually 
      introducing this file because we wish to be sure there are always
      changelogs in our tests (we are asserting for them in the top level
diff --git a/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml b/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml
index 7c1f5f51..ad52b960 100644
--- a/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml
+++ b/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
+<!-- 
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
 <document>
   <properties>
     <title>File Activity Analysis</title>
diff --git a/dashboard/src/plugin-test/subproject1/maven.xml b/dashboard/src/plugin-test/subproject1/maven.xml
index 8528043c..584e1a0a 100644
--- a/dashboard/src/plugin-test/subproject1/maven.xml
+++ b/dashboard/src/plugin-test/subproject1/maven.xml
@@ -1,6 +1,6 @@
 <!-- 
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/dashboard/src/plugin-test/subproject1/project.xml b/dashboard/src/plugin-test/subproject1/project.xml
index a847d0ed..286b138a 100644
--- a/dashboard/src/plugin-test/subproject1/project.xml
+++ b/dashboard/src/plugin-test/subproject1/project.xml
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  -->
 
 <project>
-  <extend>${basedir}/../project.xml</extend>
+  <extend>${basedir}/../common/project.xml</extend>
   <id>test-maven-dashboard-plugin-subproject1</id>
   <name>Maven Dashboard plugin test - Subproject1</name>
   <dependencies>
diff --git a/dashboard/src/plugin-test/subproject2/project.xml b/dashboard/src/plugin-test/subproject2/project.xml
index 7c57319c..11bda6d6 100644
--- a/dashboard/src/plugin-test/subproject2/project.xml
+++ b/dashboard/src/plugin-test/subproject2/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,15 @@
  -->
 
 <project>
-  <extend>${basedir}/../project.xml</extend>
+  <extend>${basedir}/../common/project.xml</extend>
   <id>test-maven-dashboard-plugin-subproject2</id>
   <name>Maven Dashboard plugin test - Subproject2</name>
   <reports>
-    <!-- Voluntarily do not put any report. We're forcing the execution
-         of artifact goals using the maven.dashboard.rungoals=true 
-         property -->
+    <!-- Voluntarily do not put any report that are part of dashboard 
+         aggregators. We're forcing the execution of artifact goals using
+         the maven.dashboard.rungoals=true property. Note that we have
+         defined one because otherwise Maven seems to use the list of
+         default reports (that's strange and looks like a bug...). -->
+    <report>maven-linkcheck-plugin</report>
   </reports>
 </project>
diff --git a/dashboard/src/plugin-test/subproject3/project.xml b/dashboard/src/plugin-test/subproject3/project.xml
index 4b726cdd..0db3a70b 100644
--- a/dashboard/src/plugin-test/subproject3/project.xml
+++ b/dashboard/src/plugin-test/subproject3/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
  -->
 
 <project>
-  <extend>${basedir}/../project.xml</extend>
+  <extend>${basedir}/../common/project.xml</extend>
   <id>test-maven-dashboard-plugin-subproject3</id>
   <name>Maven Dashboard plugin test - Subproject3</name>
 </project>
diff --git a/dashboard/xdocs/properties.xml b/dashboard/xdocs/properties.xml
index 32c96e24..179fce07 100644
--- a/dashboard/xdocs/properties.xml
+++ b/dashboard/xdocs/properties.xml
@@ -2,7 +2,7 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.