|
|
|
@ -64,8 +64,6 @@ configure(allprojects) { project -> |
|
|
|
|
repositories { |
|
|
|
|
maven { url "http://repo.spring.io/libs-release" } |
|
|
|
|
maven { url "http://repo.spring.io/milestone" } // for AspectJ 1.8.0.M1 |
|
|
|
|
maven { url "https://repository.apache.org/content/repositories/releases" } // tomcat 8 |
|
|
|
|
maven { url "https://maven.java.net/content/repositories/releases" } // javax.websocket, tyrus |
|
|
|
|
maven { url "https://oss.sonatype.org/content/repositories/releases" } // javax.cache |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -403,8 +401,8 @@ project("spring-messaging") { |
|
|
|
|
testCompile("org.eclipse.jetty:jetty-webapp:${jettyVersion}") { |
|
|
|
|
exclude group: "javax.servlet", module: "javax.servlet-api" |
|
|
|
|
} |
|
|
|
|
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC5") |
|
|
|
|
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC5") |
|
|
|
|
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10") |
|
|
|
|
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC10") |
|
|
|
|
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -581,7 +579,7 @@ project("spring-websocket") { |
|
|
|
|
optional(project(":spring-webmvc")) |
|
|
|
|
optional("javax.servlet:javax.servlet-api:3.1.0") |
|
|
|
|
optional("javax.websocket:javax.websocket-api:1.0") |
|
|
|
|
optional("org.apache.tomcat:tomcat-websocket:8.0.0-RC5") { |
|
|
|
|
optional("org.apache.tomcat:tomcat-websocket:8.0.0-RC10") { |
|
|
|
|
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" |
|
|
|
|
exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" |
|
|
|
|
} |
|
|
|
@ -595,7 +593,7 @@ project("spring-websocket") { |
|
|
|
|
} |
|
|
|
|
optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}") |
|
|
|
|
optional("com.fasterxml.jackson.core:jackson-databind:2.3.0") |
|
|
|
|
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC5") |
|
|
|
|
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10") |
|
|
|
|
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") |
|
|
|
|
testCompile("log4j:log4j:1.2.17") |
|
|
|
|
testCompile("org.projectreactor:reactor-core:1.0.0.RELEASE") |
|
|
|
|