INT-3589: Upgrade Dependencies

JIRA: https://jira.spring.io/browse/INT-3589, https://jira.spring.io/browse/INT-3624

* SF - 4.2. Fix Breaking changes for the `ApplicationEventPublisher`
* AMQP 1.5. Without issues
* Reactor - 2.0. Fix for the new `Stream` foundation
* jsonPath - 1.2.0. Fix for new `Predicate` abstraction. Add 'fail-fast error' to the `IntegrationRegistrar`
* Sshd - 0.13.0. Fix for new `VirtualFileSystemFactory` usage
* Spring Data - Fowler
* And others without issues
* Get rid of `reactor.util.StringUtils` usage

INT-3589: Address PR comments

Polishing
This commit is contained in:
Artem Bilan
2015-02-17 13:34:59 +02:00
committed by Gary Russell
parent b07686cdc0
commit f248394682
37 changed files with 312 additions and 245 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-2015 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.
@@ -18,6 +18,7 @@ package org.springframework.integration.redis.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -34,8 +35,6 @@ import org.springframework.messaging.PollableChannel;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import reactor.util.Assert;
/**
* @author David Liu
* @author Artem Bilan
@@ -68,7 +67,7 @@ public class RedisQueueInboundGatewayParserTests {
assertSame(this.receiveChannel, TestUtils.getPropertyValue(this.defaultGateway, "replyChannel"));
assertSame(this.requestChannel, TestUtils.getPropertyValue(this.defaultGateway, "requestChannel"));
assertEquals(2000L, TestUtils.getPropertyValue(this.defaultGateway, "replyTimeout"));
Assert.notNull(TestUtils.getPropertyValue(this.defaultGateway, "taskExecutor"));
assertNotNull(TestUtils.getPropertyValue(this.defaultGateway, "taskExecutor"));
assertFalse(TestUtils.getPropertyValue(this.defaultGateway, "autoStartup", Boolean.class));
assertEquals(3, TestUtils.getPropertyValue(this.defaultGateway, "phase"));
}

View File

@@ -283,6 +283,12 @@ public class RedisQueueMessageDrivenEndpointTests extends RedisAvailableTests {
exceptionEvents.add(event);
exceptionsLatch.countDown();
}
@Override
public void publishEvent(Object event) {
}
});
endpoint.setOutputChannel(channel);
endpoint.setReceiveTimeout(100);