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/multipart-http/pom.xml

@@ -8,8 +8,8 @@
 	<packaging>war</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<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>
 		<commons-fileupload>1.2.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.17</log4j.version>
@@ -26,9 +26,9 @@
 			<version>${spring.integration.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.10</version>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.3.2</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>

intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java

@@ -19,6 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
@@ -29,7 +30,7 @@ import org.springframework.http.HttpStatus;
  *
  */
 public class MultipartClientForHttpOutboundClient {
-	
+
 	private static Logger logger = Logger.getLogger(MultipartClientForHttpOutboundClient.class);
 	private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png";