diff --git a/samples/airline/client/saaj/build.xml b/samples/airline/client/saaj/build.xml
index 852558e5..77e7e2b2 100644
--- a/samples/airline/client/saaj/build.xml
+++ b/samples/airline/client/saaj/build.xml
@@ -1,16 +1,40 @@
 <?xml version="1.0"?>
 
-<project name="spring-ws-airline-sample-saaj-client" default="build">
+<project name="spring-ws-airline-sample-saaj-client" default="build"
+         xmlns:artifact="urn:maven-artifact-ant">
     <property name="bin.dir" value="bin"/>
     <property name="src.dir" value="src"/>
+    <property name="lib.dir" value="lib"/>
 
-    <target name="build">
+    <target name="init">
+        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
+            <classpath>
+                <pathelement location="lib/maven-artifact-ant-2.0.4-dep.jar"/>
+            </classpath>
+        </typedef>
+
+        <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository" layout="legacy"/>
+
+        <artifact:dependencies pathId="compile.classpath">
+            <dependency groupId="javax.xml.soap" artifactId="saaj-api" version="1.3"/>
+            <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
+            <dependency groupId="com.sun.xml.wss" artifactId="xws-security" version="2.0-ea2"/>
+            <dependency groupId="com.sun.org.apache.xml.security" artifactId="xmlsec" version="2.0"/>
+        </artifact:dependencies>
+
+        <artifact:dependencies pathId="runtime.classpath">
+            <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
+        </artifact:dependencies>
+
+    </target>
+
+
+
+
+    <target name="build" depends="init">
         <mkdir dir="${bin.dir}"/>
         <javac srcdir="${src.dir}" destdir="${bin.dir}">
-            <classpath>
-                <pathelement location="lib/saaj-api.jar"/>
-                <pathelement location="lib/xws-security.jar"/>
-            </classpath>
+            <classpath refid="compile.classpath" />
         </javac>
         <copy todir="${bin.dir}">
             <fileset dir="${src.dir}">
@@ -18,7 +42,7 @@
             </fileset>
         </copy>
     </target>
-    
+
     <target name="clean">
         <delete dir="${bin.dir}"/>
     </target>
@@ -27,31 +51,18 @@
 
     <target name="getflights" depends="build">
         <java classname="org.springframework.ws.samples.airline.client.saaj.GetFlights" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="${bin.dir}"/>
-                <pathelement location="lib/saaj-api.jar"/>
-                <pathelement location="lib/saaj-impl.jar"/>
-                <pathelement location="lib/mail.jar"/>
-                <pathelement location="lib/activation.jar"/>
-                <pathelement location="lib/xercesImpl.jar"/>
-            </classpath>
+            <classpath refid="compile.classpath"/>
+            <classpath refid="runtime.classpath"/>
+            <classpath location="${bin.dir}"/>
         </java>
     </target>
 
     <target name="getmileage" depends="build">
         <java classname="org.springframework.ws.samples.airline.client.saaj.GetFrequentFlyerMileage" fork="true"
               failonerror="true">
-            <classpath>
-                <pathelement location="${bin.dir}"/>
-                <pathelement location="lib/saaj-api.jar"/>
-                <pathelement location="lib/saaj-impl.jar"/>
-                <pathelement location="lib/mail.jar"/>
-                <pathelement location="lib/activation.jar"/>
-                <pathelement location="lib/xercesImpl.jar"/>
-                <pathelement location="lib/xws-security.jar"/>
-                <pathelement location="lib/xmldsig.jar"/>
-                <pathelement location="lib/xmlsec.jar"/>
-            </classpath>
+            <classpath refid="compile.classpath"/>
+            <classpath refid="runtime.classpath"/>
+            <classpath location="${bin.dir}"/>
             <arg value="john"/>
             <arg value="changeme"/>
         </java>
diff --git a/samples/airline/client/saaj/lib/activation.jar b/samples/airline/client/saaj/lib/activation.jar
deleted file mode 100644
index 1c88eb4e..00000000
Binary files a/samples/airline/client/saaj/lib/activation.jar and /dev/null differ
diff --git a/samples/airline/client/saaj/lib/mail.jar b/samples/airline/client/saaj/lib/mail.jar
deleted file mode 100644
index 9966ca30..00000000
Binary files a/samples/airline/client/saaj/lib/mail.jar and /dev/null differ
diff --git a/samples/airline/client/saaj/lib/maven-artifact-ant-2.0.4-dep.jar b/samples/airline/client/saaj/lib/maven-artifact-ant-2.0.4-dep.jar
new file mode 100644
index 00000000..4c18c9a5
Binary files /dev/null and b/samples/airline/client/saaj/lib/maven-artifact-ant-2.0.4-dep.jar differ
diff --git a/samples/airline/client/saaj/lib/saaj-api.jar b/samples/airline/client/saaj/lib/saaj-api.jar
deleted file mode 100644
index ad2d46d6..00000000
Binary files a/samples/airline/client/saaj/lib/saaj-api.jar and /dev/null differ
diff --git a/samples/airline/client/saaj/lib/saaj-impl.jar b/samples/airline/client/saaj/lib/saaj-impl.jar
deleted file mode 100644
index 612b638c..00000000
Binary files a/samples/airline/client/saaj/lib/saaj-impl.jar and /dev/null differ
diff --git a/samples/airline/client/saaj/lib/xercesImpl.jar b/samples/airline/client/saaj/lib/xercesImpl.jar
deleted file mode 100644
index d5f3e98c..00000000
Binary files a/samples/airline/client/saaj/lib/xercesImpl.jar and /dev/null differ
diff --git a/samples/airline/client/saaj/lib/xmldsig.jar b/samples/airline/client/saaj/lib/xmldsig.jar
deleted file mode 100644
index e4b87321..00000000
Binary files a/samples/airline/client/saaj/lib/xmldsig.jar and /dev/null differ
diff --git a/samples/airline/client/saaj/lib/xmlsec.jar b/samples/airline/client/saaj/lib/xmlsec.jar
deleted file mode 100644
index 3c79d4e5..00000000
Binary files a/samples/airline/client/saaj/lib/xmlsec.jar and /dev/null differ
diff --git a/samples/airline/client/saaj/lib/xws-security.jar b/samples/airline/client/saaj/lib/xws-security.jar
deleted file mode 100644
index 7b9caef9..00000000
Binary files a/samples/airline/client/saaj/lib/xws-security.jar and /dev/null differ