Update dependencies (Spring 4.2.1, Tomcat 8.0.26, Jetty 9.3.3)
This commit also polishes build.gradle to use double quotes consistently.
This commit is contained in:
@@ -1,29 +1,30 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
maven { url 'https://repo.spring.io/plugins-release' }
|
||||
maven { url "https://repo.spring.io/plugins-release" }
|
||||
}
|
||||
dependencies {
|
||||
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
|
||||
classpath "org.springframework.build.gradle:propdeps-plugin:0.0.7"
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'propdeps'
|
||||
apply plugin: 'propdeps-idea'
|
||||
apply plugin: 'propdeps-maven'
|
||||
apply plugin: "java"
|
||||
apply plugin: "propdeps"
|
||||
apply plugin: "propdeps-idea"
|
||||
apply plugin: "propdeps-maven"
|
||||
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://oss.jfrog.org/libs-snapshot' } // RxNetty 0.5.x snapshots
|
||||
maven { url "https://oss.jfrog.org/libs-snapshot" } // RxNetty 0.5.x snapshots
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.springframework:spring-core:4.2.0.RELEASE"
|
||||
compile "org.springframework:spring-web:4.2.0.RELEASE"
|
||||
compile "org.springframework:spring-core:4.2.1.RELEASE"
|
||||
compile "org.springframework:spring-web:4.2.1.RELEASE"
|
||||
compile "org.reactivestreams:reactive-streams:1.0.0"
|
||||
compile "io.projectreactor:reactor-stream:2.0.5.RELEASE"
|
||||
compile "commons-logging:commons-logging:1.2"
|
||||
compile "com.fasterxml.jackson.core:jackson-databind:2.6.1"
|
||||
|
||||
optional "io.reactivex:rxnetty-http:0.5.0-SNAPSHOT"
|
||||
optional "io.reactivex:rxjava-reactive-streams:1.0.1"
|
||||
@@ -31,22 +32,20 @@ dependencies {
|
||||
provided "javax.servlet:javax.servlet-api:3.1.0"
|
||||
|
||||
testCompile "junit:junit:4.12"
|
||||
testCompile "org.springframework:spring-test:4.2.0.RELEASE"
|
||||
testCompile "org.springframework:spring-test:4.2.1.RELEASE"
|
||||
|
||||
testCompile 'org.apache.tomcat:tomcat-util:8.0.24'
|
||||
testCompile 'org.apache.tomcat.embed:tomcat-embed-core:8.0.24'
|
||||
testCompile "org.apache.tomcat:tomcat-util:8.0.26"
|
||||
testCompile "org.apache.tomcat.embed:tomcat-embed-core:8.0.26"
|
||||
|
||||
testCompile 'org.eclipse.jetty:jetty-server:9.3.2.v20150730'
|
||||
testCompile 'org.eclipse.jetty:jetty-servlet:9.3.2.v20150730'
|
||||
testCompile "org.eclipse.jetty:jetty-server:9.3.3.v20150827"
|
||||
testCompile "org.eclipse.jetty:jetty-servlet:9.3.3.v20150827"
|
||||
|
||||
testCompile "org.slf4j:slf4j-jcl:1.7.12"
|
||||
testCompile "org.slf4j:jul-to-slf4j:1.7.12"
|
||||
testCompile("log4j:log4j:1.2.16")
|
||||
testCompile "log4j:log4j:1.2.16"
|
||||
|
||||
testCompile("org.mockito:mockito-core:1.10.19") {
|
||||
exclude group: 'org.hamcrest', module: 'hamcrest-core'
|
||||
exclude group: "org.hamcrest", module: "hamcrest-core"
|
||||
}
|
||||
testCompile("org.hamcrest:hamcrest-all:1.3")
|
||||
testCompile "org.hamcrest:hamcrest-all:1.3"
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user