diff --git a/parent/pom.xml b/parent/pom.xml
index bb5d14ac..ec7c14d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-parent</artifactId>
@@ -24,8 +25,10 @@
         </site>
     </distributionManagement>
     <scm>
-        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk</connection>
-        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk</developerConnection>
+        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk
+        </connection>
+        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk
+        </developerConnection>
         <url>http://fisheye3.cenqua.com/browse/springframework/spring-ws/trunk</url>
     </scm>
     <properties>
@@ -77,7 +80,7 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
-                            <Spring-WS-Version>${version}</Spring-WS-Version>
+                            <Spring-WS-Version>${pom.version}</Spring-WS-Version>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index 8e4563b9..61bc6f6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws</artifactId>
@@ -86,8 +87,10 @@
         </site>
     </distributionManagement>
     <scm>
-        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk</connection>
-        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk</developerConnection>
+        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk
+        </connection>
+        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ws/trunk
+        </developerConnection>
         <url>http://fisheye3.cenqua.com/browse/springframework/spring-ws/trunk</url>
     </scm>
     <modules>
@@ -136,7 +139,7 @@
                                     <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                                 </manifest>
                                 <manifestEntries>
-                                    <Spring-WS-Version>${version}</Spring-WS-Version>
+                                    <Spring-WS-Version>${pom.version}</Spring-WS-Version>
                                 </manifestEntries>
                             </archive>
                             <descriptors>
@@ -189,7 +192,7 @@
                     <entities>
                         <entity>
                             <name>version</name>
-                            <value>${version}</value>
+                            <value>${pom.version}</value>
                         </entity>
                     </entities>
                     <postProcess>
@@ -207,7 +210,8 @@
                                 <include name="**/*.jpg"/>
                             </fileset>
                         </copy>
-                        <move file="target/site/reference/pdf/index.pdf" tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false"/>
+                        <move file="target/site/reference/pdf/index.pdf"
+                              tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false"/>
                     </postProcess>
                 </configuration>
             </plugin>
diff --git a/src/assembly/full.xml b/src/assembly/full.xml
index 14fad2c5..9af82afe 100644
--- a/src/assembly/full.xml
+++ b/src/assembly/full.xml
@@ -79,7 +79,7 @@
                 <include>**/pom.xml</include>
                 <include>**/Makefile</include>
                 <include>mtom/**/spring-ws-logo.png</include>
-                <include>maven-artifact-ant-2.0.4-dep.jar</include>
+                <include>maven-ant-tasks-*.jar</include>
                 <includes>**/*.exe</includes>
             </includes>
             <excludes>