diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index 073c7b1b..6552d88a 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -162,7 +162,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>3.1.11</version>
+            <version>5.0.4</version>
         </dependency>
         <!-- JMS depdendencies -->
         <dependency>
diff --git a/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml b/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml
index b5586cf2..9ff9258e 100644
--- a/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml
+++ b/samples/airline/src/main/webapp/WEB-INF/airline-servlet.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-        "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-    <bean id="handlerAdapter"
-          class="org.springframework.ws.transport.http.MessageEndpointHandlerAdapter">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <bean id="handlerAdapter" class="org.springframework.ws.transport.http.WebServiceMessageReceiverHandlerAdapter">
         <description>
             The handlerAdapter makes sure that Spring's DispatcherServlet
             supports MessageEndpoints instances as handlers.
@@ -19,8 +18,7 @@
         <property name="transformLocations" value="true"/>
     </bean>
 
-    <bean id="handlerMapping"
-          class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+    <bean id="handlerMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
         <description>
             All incoming request are mapped to the messageDispatcher defined in applicationContext-ws.xml
         </description>