diff --git a/test/project.xml b/test/project.xml
index 338bd164..7f26c437 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,21 +18,20 @@
  */
  -->
 
-
 <project>
   <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-test-plugin</id>
   <name>Maven Test Plug-in</name>
-  <currentVersion>1.5-SNAPSHOT</currentVersion>
-  <description>Run JUnit tests.
-    Requires Maven 1.0 RC2.</description>
+  <currentVersion>1.5</currentVersion>
+  <description>Run JUnit tests. Requires Maven 1.0 RC2.</description>
   <shortDescription>Run JUnit tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/test/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/test/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/test/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/test/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/test/</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/test/</developerConnection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/test/</url>
   </repository>
   <developers>
     <developer>
@@ -72,4 +72,11 @@
       </properties>
     </dependency>
   </dependencies>
+  <versions>
+    <version>
+      <id>1.5</id>
+      <name>1.5</name>
+      <tag>MAVEN_TEST_1_5</tag>
+    </version>
+  </versions>
 </project>
diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml
index 465a929b..df5f9f5a 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -22,54 +23,27 @@
     <title>Changes</title>
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
-
   <body>
-    <release version="1.5" date="in CVS">
-      <action dev="dion" type="add">
-        Added maven.junit.format property that defaults to brief.
-        Changed formatters to use maven.junit.usefile consistently.
-        Only set 'dir' property of junit task if fork != 'no'
-      </action>
+    <release version="1.5" date="2004-03-07">
+      <action dev="brett" type="fix">Honour maven.test.skip for other test goals, such as compile</action>
+      <action dev="dion" type="add">Added maven.junit.format property that defaults to brief. Changed formatters to use maven.junit.usefile consistently. Only set 'dir' property of junit task if fork != 'no'</action>
     </release>
     <release version="1.4" date="2003-09-29">
-      <action dev="dion" type="update">
-        Apply MAVEN-309. Reorganise classpaths so that it's test, build, dependencies
-        and then JUnit
-      </action>
-      <action dev="jstrachan" type="fix">
-        You can now specify whether the source (java) or classes (class) files
-        are searched when using the test plugin via the property:
-        maven.test.search.classdir. It defaults to use (java) to preserve
-        backwards compatibilty. Using (class) allows you to work with alternative
-        languages that compile to bytecode like 
+      <action dev="dion" type="update">Apply MAVEN-309. Reorganise classpaths so that it's test, build, dependencies and then JUnit</action>
+      <action dev="jstrachan" type="fix">You can now specify whether the source (java) or classes (class) files are searched when using the test plugin via the property: maven.test.search.classdir. It defaults to use (java) to preserve backwards compatibilty. Using (class) allows you to work with alternative languages that compile to bytecode like
         <a href="http://groovy.codehaus.org/">Groovy</a>
       </action>
-      <action dev="evenisse" type="fix">
-        Check if unitTest tag is present in pom before copy resources.
-      </action>
+      <action dev="evenisse" type="fix">Check if unitTest tag is present in pom before copy resources.</action>
     </release>
     <release version="1.3" date="Unknown">
-      <action dev="evenisse" type="add">
-        Add jvmarg support for junit.
-        Add properties documentation.
-      </action>
+      <action dev="evenisse" type="add">Add jvmarg support for junit. Add properties documentation.</action>
     </release>
     <release version="1.2" date="2003-02-11">
-      <action dev="evenisse" type="fix">
-        Fixed classpath for test:ui, test:single and test:match goals.
-      </action>
-      <action dev="dion" type="fix">
-        Added xmlapis and xerces to project dependencies as per MAVEN-106
-        bug report
-      </action>
+      <action dev="evenisse" type="fix">Fixed classpath for test:ui, test:single and test:match goals.</action>
+      <action dev="dion" type="fix">Added xmlapis and xerces to project dependencies as per MAVEN-106 bug report</action>
     </release>
     <release version="1.1" date="2002-10-01">
-      <action dev="vmassol" type="fix">
-        The test plugin now works again if the project has not
-        tests defined. The introduction of the &lt;test:test-resources&gt;
-        goal had broken this feature.
-      </action>
+      <action dev="vmassol" type="fix">The test plugin now works again if the project has not tests defined. The introduction of the &lt;test:test-resources&gt; goal had broken this feature.</action>
     </release>
   </body>
 </document>
-
diff --git a/war/project.xml b/war/project.xml
index 398363ec..0dec92e8 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,20 +18,20 @@
  */
  -->
 
-
 <project>
   <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-war-plugin</id>
   <name>Maven WAR Plugin</name>
-  <currentVersion>1.5-SNAPSHOT</currentVersion>
+  <currentVersion>1.5</currentVersion>
   <description>War Plugin for Maven</description>
   <shortDescription>War Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/war/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/war/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/war/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/war/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/war/</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/war/</developerConnection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/war/</url>
   </repository>
   <versions>
     <version>
@@ -38,6 +39,11 @@
       <name>1.5</name>
       <tag>HEAD</tag>
     </version>
+    <version>
+      <id>1.5</id>
+      <name>1.5</name>
+      <tag>MAVEN_WAR_1_5</tag>
+    </version>
   </versions>
   <branches/>
   <mailingLists/>
@@ -59,7 +65,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>    
+    </developer>
     <developer>
       <name>Brett Porter</name>
       <id>bporter</id>
@@ -68,7 +74,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>    
+    </developer>
   </developers>
   <dependencies/>
 </project>
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 918cbf07..baeedcae 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -22,87 +23,34 @@
     <title>Changes</title>
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
-
   <body>
-
-    <release version="1.5" date="in CVS">
-      <action dev="dion" type="fix">
-        Fix for MAVEN-986. Allow resources to be copied when no sources present
-      </action>
-      <action dev="vmassol" type="add">
-        Use the new <code>caller</code> plugin to isolate the 
-        java compilation goal called from its implementation.
-      </action>
-      <action dev="bporter" type="add">
-        Add war:inplace goal for building the webapp into maven.war.src. You should cvsignore WEB-INF/lib and
-        WEB-INF/classes
-      </action>
-      <action dev="bporter" type="add">
-        Add target path to dependencies so you can copy to elsewhere than WEB-INF/lib. Useful for applets.
+    <release version="1.5" date="2004-03-07">
+      <action dev="dion" type="fix">Fix for MAVEN-986. Allow resources to be copied when no sources present</action>
+      <action dev="vmassol" type="add">Use the new
+        <code>caller</code>plugin to isolate the java compilation goal called from its implementation.
       </action>
+      <action dev="bporter" type="add">Add war:inplace goal for building the webapp into maven.war.src. You should cvsignore WEB-INF/lib and WEB-INF/classes</action>
+      <action dev="bporter" type="add">Add target path to dependencies so you can copy to elsewhere than WEB-INF/lib. Useful for applets.</action>
     </release>
-
     <release version="1.4" date="2003-09-29">
-      <action dev="dion" type="update">
-        Apply MAVEN-831.
-        Copy web.xml as specified by ${maven.war.webxml}
-      </action>
+      <action dev="dion" type="update">Apply MAVEN-831. Copy web.xml as specified by ${maven.war.webxml}</action>
       <action dev="dion" type="update">Add test project</action>
-      <action dev="evenisse" type="add">
-       Added maven.war.index property. 
-      </action>
-      <action dev="rafal" type="add">
-       Accept includes/excludes patterns over maven.war.src. 
-      </action>
-      <action dev="evenisse" type="fix">
-       Allow webapp creation if project doesn't have sources.
-      </action>
-      <action dev="michal" type="fix">
-       Added war:clean goal
-      </action>
-      <action dev="michal" type="fix">
-        war:war goal is simply packaging
-        (using ant jar task) the directory created
-        by war:webapp goal. This change simplifies
-        the customization of processing 
-        and removes code duplication.
-      </action>
-      <action dev="michal" type="fix">
-        Fixes for MAVEN-481. 
-        Bundling of tlds in war is supported.
-      </action>
-      <action dev="michal" type="fix">
-        Fixes for MAVEN-518.
-        Artifact processing in the plugin 
-        was slightly changed and now 
-        it supports jar overriding mechanism
-      </action>
-      <action dev="michal" type="add">
-        Added deploy, deploy-snapshot and install-snapshot goals
-      </action>
-      <action dev="dion" type="fix" due-to="Ben Hogan">
-        Allow war file to be updated
-      </action>      
+      <action dev="evenisse" type="add">Added maven.war.index property.</action>
+      <action dev="rafal" type="add">Accept includes/excludes patterns over maven.war.src.</action>
+      <action dev="evenisse" type="fix">Allow webapp creation if project doesn't have sources.</action>
+      <action dev="michal" type="fix">Added war:clean goal</action>
+      <action dev="michal" type="fix">war:war goal is simply packaging (using ant jar task) the directory created by war:webapp goal. This change simplifies the customization of processing and removes code duplication.</action>
+      <action dev="michal" type="fix">Fixes for MAVEN-481. Bundling of tlds in war is supported.</action>
+      <action dev="michal" type="fix">Fixes for MAVEN-518. Artifact processing in the plugin was slightly changed and now it supports jar overriding mechanism</action>
+      <action dev="michal" type="add">Added deploy, deploy-snapshot and install-snapshot goals</action>
+      <action dev="dion" type="fix" due-to="Ben Hogan">Allow war file to be updated</action>
     </release>
-    
     <release version="1.3" date="2002-04-08">
-      <action dev="dion" type="fix" due-to="Florin Vancea">
-        Fixed the broken war goal
-      </action>
+      <action dev="dion" type="fix" due-to="Florin Vancea">Fixed the broken war goal</action>
     </release>
-    
     <release version="1.2" date="2002-02-12">
-      <action dev="jvanzyl" type="add">
-        Moved the detection of the webSources inside the 'war:war' goal
-        itself so that webSource can be assembled on the fly. With the
-        detection outside the 'war:war' goal webSources would not be
-        gathered into the resulting WAR file.
-      </action>
-      <action dev="vmassol" type="add">
-        Added support for WARs that contain only java classes and no web
-        resources.
-      </action>
+      <action dev="jvanzyl" type="add">Moved the detection of the webSources inside the 'war:war' goal itself so that webSource can be assembled on the fly. With the detection outside the 'war:war' goal webSources would not be gathered into the resulting WAR file.</action>
+      <action dev="vmassol" type="add">Added support for WARs that contain only java classes and no web resources.</action>
     </release>
   </body>
 </document>
-
