diff --git a/samples/airline/client/dotnet/ant-dotnet-1.0.jar b/samples/airline/client/dotnet/ant-dotnet-1.0.jar
new file mode 100644
index 00000000..2d48db4f
Binary files /dev/null and b/samples/airline/client/dotnet/ant-dotnet-1.0.jar differ
diff --git a/samples/airline/client/dotnet/build.xml b/samples/airline/client/dotnet/build.xml
index 939057d6..d9200791 100644
--- a/samples/airline/client/dotnet/build.xml
+++ b/samples/airline/client/dotnet/build.xml
@@ -8,14 +8,19 @@
     <property name="wsdl" value="http://localhost:8080/airline/airline.wsdl"/>
     <property name="exe" value="bin/airline.exe"/>
 
-    <condition property="windows">
-        <os family="windows"/>
-    </condition>
+    <target name="init">
+        <taskdef resource="org/apache/ant/dotnet/antlib.xml">
+            <classpath>
+                <pathelement location="ant-dotnet-1.0.jar"/>
+            </classpath>
+        </taskdef>
+    </target>
 
-    <target name="generate" >
+    <target name="generate" depends="init">
         <mkdir dir="${gen.dir}"/>
 
-        <wsdltodotnet url="${wsdl}" destfile="${gen.dir}/AirlineService.cs" namespace="Spring.Ws.Samples.Airline.Client.DotNet"/>
+        <wsdltodotnet url="${wsdl}" destfile="${gen.dir}/AirlineService.cs"
+                      namespace="Spring.Ws.Samples.Airline.Client.DotNet"/>
     </target>
 
 
@@ -32,19 +37,8 @@
         <delete dir="${gen.dir}"/>
     </target>
 
-    <target name="run-windows" if="windows">
-        <exec executable="${exe}"/>
-    </target>
-
-    <target name="run-non-windows" unless="windows">
-        <exec executable="mono">
-            <arg path="${exe}"/>
-        </exec>
-    </target>
-
     <target name="run" depends="build">
-        <antcall target="run-windows"/>
-        <antcall target="run-non-windows"/>
+        <dotnetexec executable="${exe}"/>
     </target>
 
 </project>
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index 3785d559..1eccce27 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -1,4 +1,5 @@
-<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">
     <parent>
         <artifactId>spring-ws-samples</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -8,6 +9,43 @@
     <artifactId>airline</artifactId>
     <packaging>war</packaging>
     <name>Spring WS Airline Sample</name>
+    <profiles>
+        <profile>
+            <id>jdk14-jdk15</id>
+            <activation>
+                <jdk>!1.6</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <scope>provided</scope>
+                    <optional>true</optional>
+                    <version>2.1</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>javax.xml.stream</groupId>
+                            <artifactId>stax-api</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>javax.activation</groupId>
+                            <artifactId>activation</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <version>2.1.5</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
     <repositories>
         <repository>
             <id>java.net</id>
@@ -88,7 +126,8 @@
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>
-                                <java classname="org.apache.openjpa.enhance.PCEnhancer" classpathref="maven.runtime.classpath" dir="target/classes" fork="true" />
+                                <java classname="org.apache.openjpa.enhance.PCEnhancer"
+                                      classpathref="maven.runtime.classpath" dir="target/classes" fork="true"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -203,18 +242,6 @@
             <artifactId>stax-api</artifactId>
             <scope>compile</scope>
         </dependency>
-        <!-- O/X Mapping dependencies -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.1.5</version>
-            <scope>runtime</scope>
-        </dependency>
         <!-- O/R Mapping dependencies -->
         <dependency>
             <groupId>org.apache.openjpa</groupId>
@@ -226,12 +253,6 @@
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
             <artifactId>commons-dbcp</artifactId>
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
index 855d5d0a..36574250 100644
--- a/src/assembly/with-dependencies.xml
+++ b/src/assembly/with-dependencies.xml
@@ -78,6 +78,7 @@
                 <include>**/Makefile</include>
                 <include>mtom/**/spring-ws-logo.png</include>
                 <include>maven-ant-tasks-*.jar</include>
+                <include>ant-dotnet-*.jar</include>
                 <includes>**/*.exe</includes>
             </includes>
             <excludes>