diff --git a/samples/airline/client/jaxws/build.xml b/samples/airline/client/jaxws/build.xml
index 5e8f5fec..138a8e62 100644
--- a/samples/airline/client/jaxws/build.xml
+++ b/samples/airline/client/jaxws/build.xml
@@ -1,64 +1,70 @@
 <?xml version="1.0"?>
 
-<project name="spring-ws-airline-sample-jax-ws-client" default="build">
-    <property name="bin.dir" value="bin"/>
-    <property name="src.dir" value="src"/>
-    <property name="lib.dir" value="lib"/>
+<project name="spring-ws-airline-sample-jax-ws-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="init">
-        <mkdir dir="${bin.dir}"/>
-    </target>
+	<target name="init">
+		<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"/>
+			</classpath>
+		</typedef>
 
-    <target name="generate" depends="init">
-        <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
-            <classpath>
-                <pathelement location="${lib.dir}/activation.jar"/>
-                <pathelement location="${lib.dir}/jaxb-api.jar"/>
-                <pathelement location="${lib.dir}/jaxb-impl.jar"/>
-                <pathelement location="${lib.dir}/jaxb-xjc.jar"/>
-                <pathelement location="${lib.dir}/jaxws-api.jar"/>
-                <pathelement location="${lib.dir}/jaxws-rt.jar"/>
-                <pathelement location="${lib.dir}/jaxws-tools.jar"/>
-                <pathelement location="${lib.dir}/jsr181-api.jar"/>
-            </classpath>
-        </taskdef>
-        <wsimport wsdl="http://localhost:8080/airline/airline.wsdl" destdir="${bin.dir}" sourcedestdir="${src.dir}"
-                  package="org.springframework.ws.samples.airline.client.jaxws"/>
-    </target>
+		<artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository"
+			layout="legacy" />
 
-    <target name="build" depends="init">
-        <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true">
-            <classpath>
-                <pathelement location="${lib.dir}/activation.jar"/>
-                <pathelement location="${lib.dir}/jaxb-api.jar"/>
-                <pathelement location="${lib.dir}/jaxb-impl.jar"/>
-                <pathelement location="${lib.dir}/jaxws-api.jar"/>
-                <pathelement location="${lib.dir}/jaxws-rt.jar"/>
-                <pathelement location="${lib.dir}/jsr181-api.jar"/>
-            </classpath>
-        </javac>
-    </target>
+		<artifact:dependencies pathId="generate.classpath">
+            <remoteRepository refid="java.net"/>
+			<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="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 name="clean">
-        <delete dir="${bin.dir}"/>
-    </target>
+		<artifact:dependencies pathId="compile.classpath">
+			<remoteRepository refid="java.net"/>
+			<dependency groupId="javax.xml.ws" artifactId="jaxws-api" version="2.1-SNAPSHOT"/>
+		</artifact:dependencies>
 
-    <target name="run" depends="build">
-        <java classname="org.springframework.ws.samples.airline.client.jws.Main" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="${bin.dir}"/>
-                <pathelement location="${lib.dir}/activation.jar"/>
-                <pathelement location="${lib.dir}/jaxb-api.jar"/>
-                <pathelement location="${lib.dir}/jaxb-impl.jar"/>
-                <pathelement location="${lib.dir}/jaxws-api.jar"/>
-                <pathelement location="${lib.dir}/jaxws-rt.jar"/>
-                <pathelement location="${lib.dir}/jsr181-api.jar"/>
-                <pathelement location="${lib.dir}/resolver.jar"/>
-                <pathelement location="${lib.dir}/jsr173_api.jar"/>
-                <pathelement location="${lib.dir}/saaj-api.jar"/>
-                <pathelement location="${lib.dir}/saaj-impl.jar"/>
-                <pathelement location="${lib.dir}/sjsxp.jar"/>
-            </classpath>
-        </java>
-    </target>
+		<artifact:dependencies pathId="runtime.classpath">
+			<remoteRepository refid="java.net"/>
+			<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="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>
+
+	<target name="generate" depends="init">
+		<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"  classpathref="generate.classpath" />
+		<wsimport wsdl="http://localhost:8080/airline/airline.wsdl" destdir="${bin.dir}" sourcedestdir="${src.dir}"
+			package="org.springframework.ws.samples.airline.client.jaxws"/>
+	</target>
+
+	<target name="build" depends="generate">
+		<javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true">
+            <classpath refid="compile.classpath"/>
+		</javac>
+	</target>
+
+	<target name="clean">
+		<delete dir="${bin.dir}"/>
+	</target>
+
+	<target name="run" depends="build">
+		<java classname="org.springframework.ws.samples.airline.client.jws.Main" fork="true" failonerror="true">
+            <classpath refid="compile.classpath"/>
+            <classpath refid="runtime.classpath"/>
+            <classpath location="${bin.dir}"/>
+		</java>
+	</target>
 </project>
diff --git a/samples/airline/client/jaxws/lib/activation.jar b/samples/airline/client/jaxws/lib/activation.jar
deleted file mode 100644
index 8cbef16f..00000000
Binary files a/samples/airline/client/jaxws/lib/activation.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jaxb-api.jar b/samples/airline/client/jaxws/lib/jaxb-api.jar
deleted file mode 100644
index 39183837..00000000
Binary files a/samples/airline/client/jaxws/lib/jaxb-api.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jaxb-impl.jar b/samples/airline/client/jaxws/lib/jaxb-impl.jar
deleted file mode 100644
index 483d7b17..00000000
Binary files a/samples/airline/client/jaxws/lib/jaxb-impl.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jaxb-xjc.jar b/samples/airline/client/jaxws/lib/jaxb-xjc.jar
deleted file mode 100644
index d3e79d60..00000000
Binary files a/samples/airline/client/jaxws/lib/jaxb-xjc.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jaxws-api.jar b/samples/airline/client/jaxws/lib/jaxws-api.jar
deleted file mode 100644
index 4fe9f7e5..00000000
Binary files a/samples/airline/client/jaxws/lib/jaxws-api.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jaxws-rt.jar b/samples/airline/client/jaxws/lib/jaxws-rt.jar
deleted file mode 100644
index 3fa342e1..00000000
Binary files a/samples/airline/client/jaxws/lib/jaxws-rt.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jaxws-tools.jar b/samples/airline/client/jaxws/lib/jaxws-tools.jar
deleted file mode 100644
index 372d4bf5..00000000
Binary files a/samples/airline/client/jaxws/lib/jaxws-tools.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jsr173_api.jar b/samples/airline/client/jaxws/lib/jsr173_api.jar
deleted file mode 100644
index 87ff1c1a..00000000
Binary files a/samples/airline/client/jaxws/lib/jsr173_api.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/jsr181-api.jar b/samples/airline/client/jaxws/lib/jsr181-api.jar
deleted file mode 100644
index 940b1986..00000000
Binary files a/samples/airline/client/jaxws/lib/jsr181-api.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/resolver.jar b/samples/airline/client/jaxws/lib/resolver.jar
deleted file mode 100644
index 0f97dc71..00000000
Binary files a/samples/airline/client/jaxws/lib/resolver.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/saaj-api.jar b/samples/airline/client/jaxws/lib/saaj-api.jar
deleted file mode 100644
index a75a4926..00000000
Binary files a/samples/airline/client/jaxws/lib/saaj-api.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/saaj-impl.jar b/samples/airline/client/jaxws/lib/saaj-impl.jar
deleted file mode 100644
index e1fb59bb..00000000
Binary files a/samples/airline/client/jaxws/lib/saaj-impl.jar and /dev/null differ
diff --git a/samples/airline/client/jaxws/lib/sjsxp.jar b/samples/airline/client/jaxws/lib/sjsxp.jar
deleted file mode 100644
index 8aa770e8..00000000
Binary files a/samples/airline/client/jaxws/lib/sjsxp.jar and /dev/null differ