root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Tomcat 8 RC5

This commit is contained in:
Rossen Stoyanchev 2013-10-29 22:29:23 -04:00
parent a640d84961
commit eddb125836
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -68,8 +68,8 @@ configure(allprojects) { project ->
repositories { repositories {
maven { url "http://repo.spring.io/libs-release" } maven { url "http://repo.spring.io/libs-release" }
maven { url "http://repo.spring.io/milestone" } // for AspectJ 1.8.0.M1 maven { url "http://repo.spring.io/milestone" } // for AspectJ 1.8.0.M1
maven { url "https://repository.apache.org/content/repositories/releases" } // tomcat 8 RC3 maven { url "https://repository.apache.org/content/repositories/releases" } // tomcat 8
maven { url "https://repository.apache.org/content/repositories/snapshots" } // tomcat-websocket-* snapshots // maven { url "https://repository.apache.org/content/repositories/snapshots" } // tomcat 8 snapshots
maven { url "https://maven.java.net/content/repositories/releases" } // javax.websocket, tyrus maven { url "https://maven.java.net/content/repositories/releases" } // javax.websocket, tyrus
maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // javax.cache maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // javax.cache
} }
@ -406,8 +406,8 @@ project("spring-messaging") {
testCompile("org.eclipse.jetty:jetty-webapp:9.1.0.RC0") { testCompile("org.eclipse.jetty:jetty-webapp:9.1.0.RC0") {
exclude group: "javax.servlet", module: "javax.servlet-api" exclude group: "javax.servlet", module: "javax.servlet-api"
} }
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC3") testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC5")
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC3") testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC5")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
} }
@ -587,7 +587,7 @@ project("spring-websocket") {
optional(project(":spring-webmvc")) optional(project(":spring-webmvc"))
optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.servlet:javax.servlet-api:3.1.0")
optional("javax.websocket:javax.websocket-api:1.0") optional("javax.websocket:javax.websocket-api:1.0")
optional("org.apache.tomcat:tomcat-websocket:8.0.0-RC3") { optional("org.apache.tomcat:tomcat-websocket:8.0.0-RC5") {
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
} }
@ -602,7 +602,7 @@ project("spring-websocket") {
optional("org.eclipse.jetty.websocket:websocket-client:9.1.0.RC0") optional("org.eclipse.jetty.websocket:websocket-client:9.1.0.RC0")
optional("com.fasterxml.jackson.core:jackson-databind:2.2.0") optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12") optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC3") testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC5")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testCompile("log4j:log4j:1.2.17") testCompile("log4j:log4j:1.2.17")
} }