From 9f789537c1ecd0bbd3a914aba2aa41acb130ebc2 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Mon, 19 Dec 2011 21:43:12 -0500
Subject: [PATCH] INTSAMPLES-40 Fix POM for Spring 3.1.GA SI 2.1.RC1

Incompatible transitive dependencies.
---
 basic/tcp-client-server/pom.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index fb771b77..6592c0f1 100644
--- a/basic/tcp-client-server/pom.xml
+++ b/basic/tcp-client-server/pom.xml
@@ -8,12 +8,22 @@
 	<name>Samples (Basic) - TCP Client Server Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.version>3.0.6.RELEASE</spring.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ip</artifactId>