diff --git a/java/project.xml b/java/project.xml
index 97a34f62..8748dfea 100644
--- a/java/project.xml
+++ b/java/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-java-plugin</id>
   <name>Maven Java Plug-in</name>
-  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <currentVersion>1.4</currentVersion>
   <description/>
   <shortDescription>Compile java code</shortDescription>
   <url>http://maven.apache.org/reference/plugins/java/</url>
@@ -45,6 +45,11 @@
       <name>1.4</name>
       <tag>HEAD</tag>
     </version>
+    <version>
+      <id>1.4</id>
+      <name>1.4</name>
+      <tag>MAVEN_JAVA_1_4</tag>
+    </version>
   </versions>
   <developers>
     <developer>
diff --git a/java/xdocs/changes.xml b/java/xdocs/changes.xml
index bb7f57d3..4bbfc096 100644
--- a/java/xdocs/changes.xml
+++ b/java/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.
@@ -23,75 +24,39 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
     <author email="kschrader@karmalab.org">Kurt Schrader</author>
   </properties>
-
   <body>
-    
-    <release version="1.4-SNAPSHOT" date="in CVS">
+    <release version="1.4" date="2004-05-15">
       <action dev="brett" type="fix" issue="MPJAVA-18" due-to="Lynn Richards">Allow specifying a JDK to compile with other than the running one</action>
       <action dev="brett" type="fix" issue="MPJAVA-1" due-to="Scott Foster">Add memory usage parameters to pass to the ant javac task</action>
       <action dev="brett" type="fix">Add source property, default to 1.3. This is required to use JDK 1.5.</action>
     </release>
-
     <release version="1.3" date="2003-09-29">
-      <action dev="evenisse" type="remove">
-        Remove clean goals and jar goals. Clean goals and jar goals move to
-        clean plugin and jar plugin.
-      </action>
+      <action dev="evenisse" type="remove">Remove clean goals and jar goals. Clean goals and jar goals move to clean plugin and jar plugin.</action>
       <action dev="dion" type="fix">Added chgrp maven to jar:deploy.</action>
-      <action dev="dion" type="add">
-        Added velocity.log to files deleted on clean
-      </action>
+      <action dev="dion" type="add">Added velocity.log to files deleted on clean</action>
     </release>
-    
     <release version="1.2" date="2003-02-12">
-      <action dev="kschrader" type="add">
-        Added the jar:install-snapshot goal to install a SNAPSHOT
-        version jar in the local repository.
-      </action>
-      <action dev="dion" type="add" due-to="Daigo Moriwaki">
-        Added maven.compile.encoding property
-      </action>
-      <action dev="dion" type="fix">
-        Added docs on properties
-      </action>
+      <action dev="kschrader" type="add">Added the jar:install-snapshot goal to install a SNAPSHOT version jar in the local repository.</action>
+      <action dev="dion" type="add" due-to="Daigo Moriwaki">Added maven.compile.encoding property</action>
+      <action dev="dion" type="fix">Added docs on properties</action>
     </release>
     <release version="1.1" date="2002-10-06">
-      <action dev="dion" type="fix">
-        Added <a href="goals.html">goals documentation</a>
+      <action dev="dion" type="fix">Added
+        <a href="goals.html">goals documentation</a>
       </action>
-      <action dev="dion" type="add">
-        Added maven.compile.source, maven.compile.target, 
-        maven.compile.executable, maven.compile.fork and maven.compile.compilerargs
-        properties to allow people with generics to build with Maven
-      </action>
-      <action dev="vmassol" type="fix">
-        Compilation now only happens if java source is present
-      </action>
-      <action dev="dion" type="fix" issue="MAVEN-102">
-        Applied fix for MAVEN-102, which allows a manifest file to be
-        specified, as well as the defaults when jar'ing.
-      </action>
-      <action dev="smor" type="update">
-        Added goals installing and deploying the plugin:
+      <action dev="dion" type="add">Added maven.compile.source, maven.compile.target, maven.compile.executable, maven.compile.fork and maven.compile.compilerargs properties to allow people with generics to build with Maven</action>
+      <action dev="vmassol" type="fix">Compilation now only happens if java source is present</action>
+      <action dev="dion" type="fix" issue="MAVEN-102">Applied fix for MAVEN-102, which allows a manifest file to be specified, as well as the defaults when jar'ing.</action>
+      <action dev="smor" type="update">Added goals installing and deploying the plugin:
         <ol>
           <li>plugin:install installs the plugin in Maven's plugins dir</li>
-          <li>
-            plugin:deploy installs an unpacked version of the plugin in
-            Maven's plugins dir
-          </li>
+          <li>plugin:deploy installs an unpacked version of the plugin in Maven's plugins dir</li>
         </ol>
-        <p>
-          This is meant to ease the installation of plugins without having 
-          to bootstrap or manually copy the generated plugin to Maven's
-          plugins dir.
-        </p>
+        <p>This is meant to ease the installation of plugins without having to bootstrap or manually copy the generated plugin to Maven's plugins dir.</p>
       </action>
     </release>
     <release version="1.0" date="2002-08-04">
-      <action dev="jvanzyl" type="add">
-        Initial plugin created
-      </action>
+      <action dev="jvanzyl" type="add">Initial plugin created</action>
     </release>
   </body>
 </document>
-
