diff --git a/samples/airline/client/axis1/build.xml b/samples/airline/client/axis1/build.xml
index d15ce4ea..66b1ce9a 100644
--- a/samples/airline/client/axis1/build.xml
+++ b/samples/airline/client/axis1/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<project name="spring-ws-airline-sample-saaj-client" default="build"
+<project name="spring-ws-airline-sample-axis-client" default="build"
         xmlns:artifact="urn:maven-artifact-ant">
     <property name="bin.dir" value="bin"/>
     <property name="src.dir" value="src"/>
@@ -10,7 +10,7 @@
     <target name="init">
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>
 
diff --git a/samples/airline/client/jax-ws/build.xml b/samples/airline/client/jax-ws/build.xml
index e7a8023f..732b047a 100644
--- a/samples/airline/client/jax-ws/build.xml
+++ b/samples/airline/client/jax-ws/build.xml
@@ -9,42 +9,28 @@
         <mkdir dir="${bin.dir}"/>
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>
 
         <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository"
                                    layout="legacy"/>
-        <artifact:remoteRepository id="spring-ext"
-            url="https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/"/>
 
         <artifact:dependencies pathId="generate.classpath">
             <remoteRepository refid="java.net"/>
-            <remoteRepository refid="spring-ext"/>
-            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-tools" version="EA3"/>
-            <dependency groupId="com.sun.xml.bind" artifactId="jaxb-xjc" version="2.1-EA2"/>
-            <dependency groupId="com.sun.xml.stream.buffer" artifactId="streambuffer" version="0.3"/>
-            <dependency groupId="com.sun.xml.stream" artifactId="sjsxp" version="1.0"/>
+            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-tools" version="2.1.2"/>
             <dependency groupId="org.jvnet.staxex" artifactId="stax-ex" version="1.0"/>
-            <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="compile.classpath">
             <remoteRepository refid="java.net"/>
-            <remoteRepository refid="spring-ext"/>
-            <dependency groupId="javax.xml.ws" artifactId="jaxws-api" version="2.1-SNAPSHOT"/>
+            <dependency groupId="javax.xml.ws" artifactId="jaxws-api" version="2.1"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="runtime.classpath">
             <remoteRepository refid="java.net"/>
-            <remoteRepository refid="spring-ext"/>
-            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-rt" version="EA3"/>
-            <dependency groupId="com.sun.xml.bind" artifactId="jaxb-impl" version="2.1-EA2"/>
-            <dependency groupId="com.sun.xml.bind" artifactId="jaxb-xjc" version="2.1-EA2"/>
-            <dependency groupId="com.sun.xml.stream.buffer" artifactId="streambuffer" version="0.3"/>
-            <dependency groupId="com.sun.xml.stream" artifactId="sjsxp" version="1.0"/>
+            <dependency groupId="com.sun.xml.ws" artifactId="jaxws-rt" version="2.1.2"/>
             <dependency groupId="org.jvnet.staxex" artifactId="stax-ex" version="1.0"/>
-            <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
         </artifact:dependencies>
 
     </target>
diff --git a/samples/airline/client/jms/build.xml b/samples/airline/client/jms/build.xml
index 8f2f4c40..1343a051 100644
--- a/samples/airline/client/jms/build.xml
+++ b/samples/airline/client/jms/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<project name="spring-ws-airline-sample-saaj-client" default="build"
+<project name="spring-ws-airline-sample-jms-client" default="build"
         xmlns:artifact="urn:maven-artifact-ant">
     <property name="bin.dir" value="bin"/>
     <property name="src.dir" value="src"/>
@@ -8,7 +8,7 @@
     <target name="init">
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>
 
diff --git a/samples/airline/client/saaj/build.xml b/samples/airline/client/saaj/build.xml
index ab0af57b..41be748b 100644
--- a/samples/airline/client/saaj/build.xml
+++ b/samples/airline/client/saaj/build.xml
@@ -7,7 +7,7 @@
     <target name="init">
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>
 
diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
index 72c03393..f6be74fa 100644
--- a/samples/airline/client/spring-ws/build.xml
+++ b/samples/airline/client/spring-ws/build.xml
@@ -9,7 +9,7 @@
     <target name="init">
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>
 
diff --git a/samples/echo/client/saaj/build.xml b/samples/echo/client/saaj/build.xml
index f5ba0ddd..437eff6e 100644
--- a/samples/echo/client/saaj/build.xml
+++ b/samples/echo/client/saaj/build.xml
@@ -7,7 +7,7 @@
     <target name="init">
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>
 
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index 1e557398..6806af1c 100644
--- a/samples/echo/client/spring-ws/build.xml
+++ b/samples/echo/client/spring-ws/build.xml
@@ -7,7 +7,7 @@
     <target name="init">
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>
 
diff --git a/samples/maven-ant-tasks-2.0.7.jar b/samples/maven-ant-tasks-2.0.7.jar
new file mode 100644
index 00000000..4f0dfdd6
Binary files /dev/null and b/samples/maven-ant-tasks-2.0.7.jar differ
diff --git a/samples/maven-artifact-ant-2.0.4-dep.jar b/samples/maven-artifact-ant-2.0.4-dep.jar
deleted file mode 100644
index 4c18c9a5..00000000
Binary files a/samples/maven-artifact-ant-2.0.4-dep.jar and /dev/null differ
diff --git a/samples/mtom/client/jaxws/build.xml b/samples/mtom/client/jaxws/build.xml
index 84f817f3..0e9108bb 100644
--- a/samples/mtom/client/jaxws/build.xml
+++ b/samples/mtom/client/jaxws/build.xml
@@ -10,7 +10,7 @@
         <mkdir dir="${bin.dir}"/>
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="${basedir}/../../../maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../../../maven-ant-tasks-2.0.7.jar"/>
             </classpath>
         </typedef>