diff --git a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java b/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
index 773338c6..ab959a93 100644
--- a/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
+++ b/samples/airline/client/spring-ws/src/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
@@ -18,6 +18,7 @@ package org.springframework.ws.samples.airline.client.sws;
 
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamResult;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -36,11 +37,8 @@ public class GetFrequentFlyerMileage extends WebServiceGatewaySupport {
         Source source = new StringSource(
                 "<GetFrequentFlyerMileageRequest xmlns=\"http://www.springframework.org/spring-ws/samples/airline/schemas/messages\" />");
 
-        Result result = new StringResult();
+        getWebServiceTemplate().sendSourceAndReceiveToResult(source, new StreamResult(System.out));
 
-        getWebServiceTemplate().sendSourceAndReceiveToResult(source, result);
-
-        System.out.println("result = " + result);
     }
 
     public static void main(String[] args) {
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index ad55575a..a33e263d 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -38,6 +38,16 @@
                     <version>2.1.5</version>
                     <scope>runtime</scope>
                 </dependency>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.messaging.saaj</groupId>
+                    <artifactId>saaj-impl</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
                 <dependency>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
diff --git a/samples/airline/readme.txt b/samples/airline/readme.txt
index 976c6231..c5aca148 100644
--- a/samples/airline/readme.txt
+++ b/samples/airline/readme.txt
@@ -12,7 +12,9 @@ Multiple clients are available, showing interoperability with Axis 1, SAAJ, C#,
 
 2. INSTALLATION
 
-The Airline sample is a normal web application that connects to a HSQLDB database.
+The Airline sample is a normal web application that connects to an embedded
+HSQLDB database. It requires JDK 1.5 to run; JDK 1.6 works as well, except for
+the WS-Security endpoints.
 
 To execute the sample, run "mvn jetty:run" to run the sample in the Jetty6 Web container.
 
@@ -21,4 +23,4 @@ To create a war file instead of running in Jetty, use "mvn package".
 3. THE CLIENTS
 
 The client directory contains a number of sample clients. More instructions are provided in the readme files in the
-directories.
\ No newline at end of file
+directories.
diff --git a/samples/mtom/pom.xml b/samples/mtom/pom.xml
index c2fd302e..4299229c 100644
--- a/samples/mtom/pom.xml
+++ b/samples/mtom/pom.xml
@@ -28,6 +28,43 @@
             </plugin>
         </plugins>
     </reporting>
+    <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>
    <build>
       <plugins>
          <plugin>
@@ -67,26 +104,5 @@
          <artifactId>spring-oxm-tiger</artifactId>
          <scope>runtime</scope>
       </dependency>
-      <!-- JEE Mapping dependencies -->
-       <dependency>
-           <groupId>javax.activation</groupId>
-           <artifactId>activation</artifactId>
-       </dependency>
-      <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>
-      <dependency>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-          <scope>runtime</scope>
-      </dependency>
    </dependencies>
 </project>
diff --git a/samples/pom.xml b/samples/pom.xml
index 42f5641b..7eaa6292 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -22,6 +22,43 @@
             <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
         </repository>        
     </repositories>
+    <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>
     <build>
         <plugins>
             <plugin>
@@ -44,27 +81,5 @@
             <artifactId>log4j</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!-- The following JEE dependencies can be changed from 'runtime' to 'provided' if you're running the samples on a full-fledged J2EE application
-        server. They are required for running the samples on a Web container such as Tomcat -->
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.messaging.saaj</groupId>
-            <artifactId>saaj-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 </project>