diff --git a/pom.xml b/pom.xml
index 4f2b49e884..a0b371595c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,7 +431,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.7</version>
+				<version>2.5</version>
 				<configuration>
 					<javadoc:aggregate>true</javadoc:aggregate>
 					<breakiterator>true</breakiterator>
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java
index 4de8044e9c..1201ce3b36 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java
@@ -16,6 +16,9 @@
 
 package org.springframework.integration.ip;
 
+import java.net.DatagramSocket;
+import java.net.Socket;
+
 /**
  * @author Gary Russell
  * @since 2.0
@@ -25,21 +28,18 @@ public interface CommonSocketOptions {
 	/**
 	 * @see Socket#setSoTimeout(int)
 	 * @see DatagramSocket#setSoTimeout(int)
-	 * @param timeout
 	 */
 	public void setSoTimeout(int soTimeout);
 
 	/**
 	 * @see Socket#setReceiveBufferSize(int)
 	 * @see DatagramSocket#setReceiveBufferSize(int)
-	 * @param size
 	 */
 	public void setSoReceiveBufferSize(int soReceiveBufferSize);
 
 	/**
 	 * @see Socket#setSendBufferSize(int)
 	 * @see DatagramSocket#setSendBufferSize(int)
-	 * @param size
 	 */
 	public void setSoSendBufferSize(int soSendBufferSize);
 	
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractSocketWriter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractSocketWriter.java
index 3277cf9576..4624152a86 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractSocketWriter.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractSocketWriter.java
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory;
  * {@link java.nio.channels.SocketChannel} implementations are provided for
  * the standard formats. Users requiring other formats should subclass the
  * appropriate implementation, and provide an implementation for 
- * {@link #writeCustomFormat(byte[])} which is invoked by {@link #write(byte[])}
+ * {@link #writeCustomFormat(Object)} which is invoked by {@link #write(Object)}
  * when the format is {@link MessageFormats#FORMAT_CUSTOM}. 
  * 
  * @author Gary Russell
@@ -46,7 +46,7 @@ public abstract class AbstractSocketWriter implements SocketWriter, MessageForma
     protected final Log logger = LogFactory.getLog(this.getClass());
 
     /*
-	 * @see org.springframework.integration.ip.tcp.SocketWriter#write(byte[])
+	 * @see org.springframework.integration.ip.tcp.SocketWriter#write(Object)
 	 */
 	public synchronized void write(Object object) throws IOException {
 		try {
@@ -100,19 +100,16 @@ public abstract class AbstractSocketWriter implements SocketWriter, MessageForma
 
 	/**
 	 * Write the data, followed by carriage return, line feed ('\r\n').
-	 * @param bytes
 	 */
 	protected abstract void writeCrLfFormat(byte[] bytes) throws IOException;
 
 	/**
 	 * Write the data, followed by carriage return, line feed ('\r\n').
-	 * @param bytes
 	 */
 	protected abstract void writeSerializedFormat(Object object) throws IOException;
 
 	/**
 	 * Write the data using some custom protocol.
-	 * @param bytes
 	 */
 	protected abstract void writeCustomFormat(Object object) throws IOException;
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java
index e159be0efc..3edf214860 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java
@@ -159,7 +159,7 @@ public class NetSocketReader extends AbstractSocketReader {
 	 * Throws {@link UnsupportedOperationException}; custom implementations can
 	 * subclass this class and provide an implementation for this method.
 	 * @throws IOException 
-	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat().
+	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat
 	 * 
 	 */
 	@Override
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java
index 4b2f7aa8a6..73c2c77599 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java
@@ -240,7 +240,7 @@ public class NioSocketReader extends AbstractSocketReader {
 	 * Throws {@link UnsupportedOperationException}; Java serialization is currently only
 	 * supported using the NetSocketReader.
 	 * @throws IOException 
-	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat().
+	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat
 	 * 
 	 */
 	protected int assembleDataSerializedFormat() throws IOException {
@@ -252,7 +252,7 @@ public class NioSocketReader extends AbstractSocketReader {
 	 * Throws {@link UnsupportedOperationException}; custom implementations can
 	 * subclass this class and provide an implementation.
 	 * @throws IOException 
-	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat().
+	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat
 	 * 
 	 */
 	@Override
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java
index 90eb168a97..ff758b351e 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java
@@ -22,7 +22,6 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.net.NetworkInterface;
-import java.net.SocketAddress;
 
 import org.springframework.integration.message.MessageHandler;
 
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/CustomNioSocketReader.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/CustomNioSocketReader.java
index 272fbbcec9..d638aabb1d 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/CustomNioSocketReader.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/CustomNioSocketReader.java
@@ -33,9 +33,6 @@ public class CustomNioSocketReader extends NioSocketReader {
 		super(null);
 	}
 	
-	/**
-	 * @param socket
-	 */
 	public CustomNioSocketReader(SocketChannel channel) {
 		super(channel);
 	}
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java
index 2fc5abdd6e..2d1e6f05e6 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketReaderTests.java
@@ -37,10 +37,6 @@ import org.springframework.integration.ip.util.SocketUtils;
  */
 public class NetSocketReaderTests {
 
-	/**
-	 * Test method for {@link org.springframework.integration.ip.tcp.NioSocketReader#readFully()},
-	 * using &lt;length&gt;&lt;message&gt;.
-	 */
 	@Test
 	public void testReadLength() throws Exception {
 		int port = SocketUtils.findAvailableServerSocket();
@@ -67,10 +63,6 @@ public class NetSocketReaderTests {
 		server.close();
 	}
 	
-	/**
-	 * Test method for {@link org.springframework.integration.ip.tcp.NioSocketReader#readFully()},
-	 * using STX&lt;message&gt;ETX
-	 */
 	@Test
 	public void testReadStxEtx() throws Exception {
 		int port = SocketUtils.findAvailableServerSocket();
@@ -98,10 +90,6 @@ public class NetSocketReaderTests {
 		server.close();
 	}
 
-	/**
-	 * Test method for {@link org.springframework.integration.ip.tcp.NioSocketReader#readFully()},
-	 * using STX&lt;message&gt;ETX
-	 */
 	@Test
 	public void testReadCrLf() throws Exception {
 		int port = SocketUtils.findAvailableServerSocket();
@@ -129,10 +117,6 @@ public class NetSocketReaderTests {
 		server.close();
 	}
 
-	/**
-	 * Test method for {@link org.springframework.integration.ip.tcp.NioSocketReader#readFully()},
-	 * using STX&lt;message&gt;ETX
-	 */
 	@Test
 	public void testReadSerialized() throws Exception {
 		int port = SocketUtils.findAvailableServerSocket();
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java
index 8f818a58ed..7fec1fb8c7 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java
@@ -38,8 +38,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 public class SimpleTcpNetInboundGatewayTests {
 	
-	private static int startup = 2000;
-	
 	@Autowired
 	@Qualifier(value="gatewayCrLf")
 	SimpleTcpNetInboundGateway gatewayCrLf;
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java
index ed057a4ae1..96993ec10b 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java
@@ -103,9 +103,6 @@ public class SocketUtils {
 	/**
 	 * Test for reassembly of completely fragmented message; sends
 	 * 6 bytes 500ms apart.
-	 * @param os
-	 * @param b
-	 * @throws Exception
 	 */
 	public static void testSendFragmented(final int port, final boolean noDelay) {
 		Thread thread = new Thread(new Runnable() {
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/control/MessageChannelInfo.java b/spring-integration-jmx/src/main/java/org/springframework/integration/control/MessageChannelInfo.java
index 70f053063a..647ed6f771 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/control/MessageChannelInfo.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/control/MessageChannelInfo.java
@@ -37,7 +37,6 @@ interface MessageChannelInfo {
 
 	/**
 	 * Number of Messages that have caused Exceptions on send.
-	 * @return
 	 */
 	long getSendErrorCount();
 
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java
index 72b6fd94a0..24ff51ef70 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java
@@ -67,7 +67,6 @@ public class BanksChannelSelector {
 
 	/**
 	 * @param message
-	 * @return
 	 */
 	@SuppressWarnings("unchecked")
 	public Set<String> selectBankChannels(Message<?> message) {