diff --git a/j2ee/plugin.jelly b/j2ee/plugin.jelly
index 281f3f31..cfb8a125 100644
--- a/j2ee/plugin.jelly
+++ b/j2ee/plugin.jelly
@@ -49,9 +49,8 @@
       </ant:classpath>
     </ant:taskdef>
     
-    <j:set var="warBuildDir"
-      value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
-
+    <maven:get var="warBuildDir" plugin="maven-war-plugin" property="maven.war.build.dir"/>
+    
     <ant:warvalidator warFileName="${warBuildDir}/${pom.artifactId}.war">
       <ant:formatter type="plain" usefile="false"/>
     </ant:warvalidator>
diff --git a/j2ee/project.xml b/j2ee/project.xml
index c406c3ea..3e8d90eb 100644
--- a/j2ee/project.xml
+++ b/j2ee/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-j2ee-plugin</id>
   <name>Maven J2EE Plugin</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.5.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>J2EE tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/j2ee/</url>
diff --git a/j2ee/xdocs/changes.xml b/j2ee/xdocs/changes.xml
index c561cd75..71d2ae11 100644
--- a/j2ee/xdocs/changes.xml
+++ b/j2ee/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="plynch@apache.org">Peter Lynch</author>
   </properties>
   <body>
+    <release version="1.5.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="update">Remove pom.getPluginContext code and replace with maven:get</action>
+    </release>
     <release version="1.5" date="2004-05-15">
       <action dev="dion" type="update">Remove Ant dependency</action>
       <action dev="dion" type="fix">Fix issues with DOM classes and jdk1.3</action>
diff --git a/struts/plugin.jelly b/struts/plugin.jelly
index 937e6ec4..18e3aa9e 100644
--- a/struts/plugin.jelly
+++ b/struts/plugin.jelly
@@ -18,7 +18,9 @@
  -->
 
 
-<project xmlns:j="jelly:core" xmlns:log="jelly:log">
+<project xmlns:j="jelly:core"
+         xmlns:maven="jelly:maven"
+         xmlns:log="jelly:log">
 
   <!-- default goal (same name as plugin -->
   <goal name="struts"
@@ -41,8 +43,7 @@
       </classpath>
     </taskdef>
 
-    <j:set var="warBuildDir"
-      value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
+    <maven:get var="warBuildDir" plugin="maven-war-plugin" property="maven.war.build.dir"/>
 
     <struts10warvalidator
       warFileName="${warBuildDir}/${pom.artifactId}.war">
diff --git a/struts/project.xml b/struts/project.xml
index 35452915..d054bf2f 100644
--- a/struts/project.xml
+++ b/struts/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-struts-plugin</id>
   <name>Maven Struts Plugin</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.3.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Work with struts jars</shortDescription>
   <url>http://maven.apache.org/reference/plugins/struts/</url>
diff --git a/struts/xdocs/changes.xml b/struts/xdocs/changes.xml
index 2ec968d6..8bbff2ed 100644
--- a/struts/xdocs/changes.xml
+++ b/struts/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.3.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="update">Remove old pom.getPluginContext code</action>
+    </release>
     <release version="1.3" date="2004-05-15">
       <action dev="dion" type="update">Remove unneeded ant dependency</action>
     </release>
