Gary Russell
2bc0c442ce
Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP
Conflicts:
spring-integration-core/src/main/java/org/springframework/integration/channel/registry/ChannelRegistry.java
spring-integration-core/src/main/java/org/springframework/integration/channel/registry/LocalChannelRegistry.java
spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java
spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJacksonJsonMessageParser.java
spring-integration-core/src/test/java/org/springframework/integration/channel/registry/LocalChannelRegistryTests.java
spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/ServiceActivatorDefaultFrameworkMethodTests.java
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
Resolved.