INTSAMPLES-138: Make SI 4.1 as minimal

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

* Upgrade to Boot 1.2, which is based on the SI 4.1
* Upgrade to SF 4.1.1
* Fix `feed` sample to use new `Rome` dep. from SI
* Fix deprecations for `@Payload`, `@Header` etc.
* Fix mongo` sample deprecation warn

intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/ConditionalService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.samples.advice;
 
 import java.util.Calendar;
@@ -22,7 +23,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.integration.annotation.Header;
+
+import org.springframework.messaging.handler.annotation.Header;
 
 /**
  * @author Gary Russell
@@ -72,4 +74,5 @@ public class ConditionalService {
 		}
 		logger.info("Service success for " + payload);
 	}
+
 }

intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors
+ * Copyright 2002-2014 the original author or authors
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -13,12 +13,13 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
+
 package org.springframework.integration.samples.storedprocedure.service;
 
 import java.util.List;
 
-import org.springframework.integration.annotation.Payload;
 import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage;
+import org.springframework.messaging.handler.annotation.Payload;
 
 
 /**
@@ -32,7 +33,7 @@ public interface CoffeeService {
     /**
      * Find the description for a provided coffee beverage.
      *
-     * @param Id of the coffee beverage
+     * @param input of the coffee beverage
      * @return The the description of the coffee beverage
      */
 	String findCoffeeBeverage(Integer input);

intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors
+ * Copyright 2002-2014 the original author or authors
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -13,12 +13,13 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
+
 package org.springframework.integration.samples.storedprocedure.service;
 
 import java.util.List;
 
-import org.springframework.integration.annotation.Payload;
 import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage;
+import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -34,7 +35,7 @@ public interface CoffeeService {
 	/**
 	 * Find the description for a provided coffee beverage.
 	 *
-	 * @param Id of the coffee beverage
+	 * @param input of the coffee beverage
 	 * @return The the description of the coffee beverage
 	 */
 	String findCoffeeBeverage(Integer input);

intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors
+ * Copyright 2002-2014 the original author or authors
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -13,12 +13,13 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
+
 package org.springframework.integration.samples.storedprocedure.service;
 
 import java.util.List;
 
-import org.springframework.integration.annotation.Payload;
 import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage;
+import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -34,7 +35,7 @@ public interface CoffeeService {
 	/**
 	 * Find the description for a provided coffee beverage.
 	 *
-	 * @param Id of the coffee beverage
+	 * @param input of the coffee beverage
 	 * @return The the description of the coffee beverage
 	 */
 	String findCoffeeBeverage(Integer input);