Index: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java
===================================================================
--- modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java	(revision 17777)
+++ modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.java	(working copy)
@@ -31,6 +31,7 @@
  */
 public class TestServlet extends HttpServlet
 {
+    private static final long serialVersionUID = -2137273317393754516L;
     private Endpoint _endpoint;
 
     @Override
Index: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java
===================================================================
--- modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java	(revision 17777)
+++ modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java	(working copy)
@@ -4,7 +4,6 @@
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
-import javax.naming.InitialContext;
 
 import junit.framework.Test;
 
@@ -22,8 +21,8 @@
    public void testJMXBean() throws Exception {
       MBeanServerConnection server = getServer();
       ObjectName name = new ObjectName("org.apache.cxf:*");
-      Set cxfBeans = server.queryMBeans(name, null);
-      assertTrue(cxfBeans.size() > 0); 
+      Set<?> cxfBeans = server.queryMBeans(name, null);
+      assertTrue(cxfBeans.size() > 0);
    }
 
 }
Index: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/EndpointImpl.java
===================================================================
--- modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/EndpointImpl.java	(revision 17777)
+++ modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/EndpointImpl.java	(working copy)
@@ -23,11 +23,11 @@
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;
-import javax.servlet.annotation.WebServlet;
 
 @WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/spring", endpointInterface = "org.jboss.test.ws.jaxws.cxf.spring.Endpoint")
 public class EndpointImpl implements Endpoint
 {
+   @Override
    @WebMethod
    public String echo(String input)
    {
Index: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java
===================================================================
--- modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java	(revision 17777)
+++ modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java	(working copy)
@@ -22,7 +22,6 @@
 package org.jboss.test.ws.jaxws.samples.mtom;
 
 import javax.jws.WebService;
-import javax.xml.ws.soap.Addressing;
 
 @WebService
 (
@@ -34,6 +33,7 @@
 )
 public class ServiceImpl implements ServiceIface
 {
+   @Override
    public String sayHello()
    {
       return "Hello World!";