Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to reactor 1.1 RC1

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-04-25 12:32:36 -04:00
parent 443fb8e4ee
commit a4d6f8473e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -77,7 +77,7 @@ configure(allprojects) { project ->
repositories {
maven { url "http://repo.spring.io/libs-release" }
maven { url "http://repo.spring.io/snapshot" } // temporarily until Reactor 1.1.0.RC1
maven { url "http://repo.spring.io/milestone" } // for Reactor 1.1 RC1
}
dependencies {
@@ -396,8 +396,8 @@ project("spring-messaging") {
compile(project(":spring-beans"))
compile(project(":spring-core"))
compile(project(":spring-context"))
optional("org.projectreactor:reactor-core:1.1.0.BUILD-SNAPSHOT")
optional("org.projectreactor:reactor-net:1.1.0.BUILD-SNAPSHOT")
optional("org.projectreactor:reactor-core:1.1.0.RC1")
optional("org.projectreactor:reactor-net:1.1.0.RC1")
optional("org.projectreactor:reactor-tcp:1.0.1.RELEASE")
optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet-api"
@@ -625,8 +625,8 @@ project("spring-websocket") {
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:8.0.3")
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.3")
testCompile("org.projectreactor:reactor-core:1.1.0.BUILD-SNAPSHOT")
testCompile("org.projectreactor:reactor-net:1.1.0.BUILD-SNAPSHOT")
testCompile("org.projectreactor:reactor-core:1.1.0.RC1")
testCompile("org.projectreactor:reactor-net:1.1.0.RC1")
testCompile("log4j:log4j:1.2.17")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
}

1
spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java
View File

@@ -29,7 +29,6 @@ import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.simp.TestPrincipal;
import org.springframework.messaging.support.MessageBuilder;
import sun.security.provider.SHA;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;