INTSAMPLES-127 Polishing

- PR Comments
- Switch to Jackson2
- Fix oxm config

Polishing

INTSAMPLES-127 Update to SI 4.0.0.RC1

INTSAMPLES-127 Remove Servlet Dependency

travel sample; see INT-3350.

INTSAMPLES-127 Update Samples to SI 4.0.0

JIRA: https://jira.spring.io/browse/INTSAMPLES-127

Created `maint` branch for ongoing SI 3.0.x samples.

intermediate/rest-http/pom.xml

@@ -13,8 +13,8 @@
 	</prerequisites>
 
 	<properties>
-		<spring.integration.version>3.0.2.RELEASE</spring.integration.version>
-		<spring.version>3.2.8.RELEASE</spring.version>
+		<spring.integration.version>4.0.0.RC1</spring.integration.version>
+		<spring.version>4.0.3.RELEASE</spring.version>
 		<spring.security.version>3.1.4.RELEASE</spring.security.version>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
@@ -31,9 +31,9 @@
 			<version>${spring.integration.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.8.0</version>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.3.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -76,12 +76,24 @@
 			<artifactId>spring-security-core</artifactId>
 			<scope>compile</scope>
 			<version>${spring.security.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-support</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
 			<scope>compile</scope>
 			<version>${spring.security.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-support</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>