diff --git a/war/plugin.jelly b/war/plugin.jelly
index 5e569f2c..ae9f0269 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -4,7 +4,8 @@
          xmlns:license="license"
          xmlns:util="jelly:util"
          xmlns:ant="jelly:ant"
-         xmlns:artifact="artifact">
+         xmlns:artifact="artifact"
+         xmlns:caller="caller">
 
   <!--==================================================================-->
   <!-- Default goal : Builds a war file                                 -->
@@ -21,7 +22,7 @@
       file="${maven.war.src}"/>
 
     <j:if test="${sourcesPresent == 'true'}">
-      <attainGoal name="java:compile"/>
+      <caller:call goalInterface="compile-java"/>
       <attainGoal name="test:test"/>
     </j:if>
 
diff --git a/war/project.xml b/war/project.xml
index 33c463d1..8d84d35b 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-war-plugin</id>
   <name>Maven WAR Plugin</name>
-  <currentVersion>1.4</currentVersion>
+  <currentVersion>1.5-SNAPSHOT</currentVersion>
   <description>War Plugin for Maven</description>
   <shortDescription>War Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/war/</url>
@@ -14,7 +14,13 @@
     <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>
   </repository>
-  <versions/>
+  <versions>
+    <version>
+      <id>1.5</id>
+      <name>1.5</name>
+      <tag>HEAD</tag>
+    </version>  
+  </versions>
   <branches/>
   <mailingLists/>
   <developers>
@@ -39,8 +45,8 @@
     <developer>
       <name>Vincent Massol</name>
       <id>vmassol</id>
-      <email>vmassol@octo.com</email>
-      <organization>Octo Technology</organization>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 97adeb5d..0104d1d7 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -2,11 +2,18 @@
 <document>
   <properties>
     <title>Changes</title>
-    <author email="vmassol@octo.com">Vincent Massol</author>
+    <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
 
   <body>
 
+    <release version="1.5" date="in CVS">
+      <action dev="vmassol" type="add">
+        Use the new <code>caller</code> plugin to isolate the 
+        java compilation goal called from its implementation.
+      </action>
+    </release>
+
     <release version="1.4" date="2003-09-29">
       <action dev="dion" type="update">
         Apply MAVEN-831.