Apply patches for MAVEN-531

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113789 13f79535-47bb-0310-9956-ffa450edef68

deploy/plugin.jelly

@@ -62,14 +62,14 @@
       <j:set var="typeX" value="${type}X"/>
       <j:choose>
         <j:when test="${typeX != 'X'}">
-          <ant:property 
-            name="resolvedDirectory" 
+          <j:set 
+            var="resolvedDirectory" 
             value="${siteDirectory}/${pom.artifactDirectory}/${type}"
           />
         </j:when>
         <j:otherwise>
-          <ant:property 
-            name="resolvedDirectory" 
+          <j:set 
+            var="resolvedDirectory" 
             value="${siteDirectory}/${pom.artifactDirectory}"
           />
         </j:otherwise>