Browse Source

Latest dependency updates (POI 3.17, Rome 1.8, EhCache 3.4, Caffeine 2.5.6, RxJava 2.1.4, Tomcat 8.5.21, JRuby 9.1.13, Rhino 1.7.7.2)

pull/1533/head
Juergen Hoeller 7 years ago
parent
commit
9190b76ab9
  1. 4
      build.gradle
  2. 1
      spring-beans/spring-beans.gradle
  3. 4
      spring-context-support/spring-context-support.gradle
  4. 2
      spring-core/spring-core.gradle
  5. 2
      spring-test/spring-test.gradle
  6. 46
      spring-web/spring-web.gradle
  7. 24
      spring-webflux/spring-webflux.gradle
  8. 12
      spring-webmvc/spring-webmvc.gradle

4
build.gradle

@ -63,10 +63,10 @@ configure(allprojects) { project -> @@ -63,10 +63,10 @@ configure(allprojects) { project ->
ext.reactorVersion = "Bismuth-RC1"
ext.rxjavaVersion = '1.3.2'
ext.rxjavaAdapterVersion = '1.2.1'
ext.rxjava2Version = '2.1.3'
ext.rxjava2Version = '2.1.4'
ext.slf4jVersion = "1.7.25"
ext.tiles3Version = "3.0.7"
ext.tomcatVersion = "8.5.20"
ext.tomcatVersion = "8.5.21"
ext.undertowVersion = "1.4.20.Final"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"

1
spring-beans/spring-beans.gradle

@ -30,4 +30,3 @@ compileGroovy { @@ -30,4 +30,3 @@ compileGroovy {
compileGroovy.dependsOn = compileGroovy.taskDependencies.values - 'compileJava'
compileKotlin.dependsOn(compileGroovy)
compileKotlin.classpath += files(compileGroovy.destinationDir)

4
spring-context-support/spring-context-support.gradle

@ -9,7 +9,7 @@ dependencies { @@ -9,7 +9,7 @@ dependencies {
optional("javax.activation:activation:${activationVersion}")
optional("javax.mail:javax.mail-api:${javamailVersion}")
optional("javax.cache:cache-api:1.0.0")
optional("com.github.ben-manes.caffeine:caffeine:2.5.5")
optional("com.github.ben-manes.caffeine:caffeine:2.5.6")
optional("net.sf.ehcache:ehcache:2.10.4")
optional("org.quartz-scheduler:quartz:2.3.0")
optional("org.codehaus.fabric3.api:commonj:1.1.0")
@ -19,7 +19,7 @@ dependencies { @@ -19,7 +19,7 @@ dependencies {
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.3.1")
testRuntime("org.ehcache:ehcache:3.4.0")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("javax.annotation:javax.annotation-api:1.3")
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")

2
spring-core/spring-core.gradle

@ -76,7 +76,7 @@ dependencies { @@ -76,7 +76,7 @@ dependencies {
compile(files(cglibRepackJar))
compile(files(objenesisRepackJar))
compile(project(":spring-jcl"))
optional("net.sf.jopt-simple:jopt-simple:5.0.3")
optional("net.sf.jopt-simple:jopt-simple:5.0.4")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")

2
spring-test/spring-test.gradle

@ -71,7 +71,7 @@ dependencies { @@ -71,7 +71,7 @@ dependencies {
testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
testCompile("com.rometools:rome:1.7.4")
testCompile("com.rometools:rome:1.8.0")
testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
testCompile("org.apache.tiles:tiles-core:${tiles3Version}") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"

46
spring-web/spring-web.gradle

@ -24,47 +24,47 @@ dependencies { @@ -24,47 +24,47 @@ dependencies {
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.faces:javax.faces-api:2.2")
optional("javax.json.bind:javax.json.bind-api:1.0")
optional("javax.mail:javax.mail-api:${javamailVersion}")
optional("javax.validation:validation-api:1.1.0.Final")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("com.caucho:hessian:4.0.51")
optional("commons-fileupload:commons-fileupload:1.3.3")
optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
optional("io.projectreactor.ipc:reactor-netty")
optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
optional("io.reactivex:rxjava:${rxjavaVersion}")
optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
optional("io.netty:netty-all")
optional("io.projectreactor.ipc:reactor-netty")
optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
optional("io.undertow:undertow-core:${undertowVersion}")
optional("com.fasterxml.woodstox:woodstox-core:5.0.3") { // woodstox before aalto
exclude group: "stax", module: "stax-api"
optional("org.eclipse.jetty:jetty-server:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("com.fasterxml:aalto-xml:1.0.0")
optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("io.undertow:undertow-core:${undertowVersion}")
optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("io.netty:netty-all")
optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
optional("commons-fileupload:commons-fileupload:1.3.3")
optional("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
optional("com.fasterxml.woodstox:woodstox-core:5.0.3") { // woodstox before aalto
exclude group: "stax", module: "stax-api"
}
optional("com.fasterxml:aalto-xml:1.0.0")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
optional("com.google.code.gson:gson:2.8.1")
optional("javax.json.bind:javax.json.bind-api:1.0")
optional("com.rometools:rome:1.7.4")
optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("org.eclipse.jetty:jetty-server:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("com.google.code.gson:gson:2.8.2")
optional("com.google.protobuf:protobuf-java-util:3.4.0")
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
optional("javax.mail:javax.mail-api:${javamailVersion}")
optional("com.rometools:rome:1.8.0")
optional("com.caucho:hessian:4.0.51")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("io.projectreactor:reactor-test")

24
spring-webflux/spring-webflux.gradle

@ -22,16 +22,13 @@ dependencies { @@ -22,16 +22,13 @@ dependencies {
optional(project(":spring-context-support")) // for FreeMarker support
optional("javax.servlet:javax.servlet-api:3.1.0")
optional("javax.websocket:javax.websocket-api:1.1")
optional("org.webjars:webjars-locator:0.32-1")
optional("org.freemarker:freemarker:${freemarkerVersion}")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
optional("org.freemarker:freemarker:${freemarkerVersion}")
optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
exclude group: "commons-logging", module: "commons-logging"
}
optional('org.webjars:webjars-locator:0.32-1')
optional("io.projectreactor.ipc:reactor-netty")
optional("io.reactivex:rxjava:${rxjavaVersion}")
optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
optional("io.projectreactor.ipc:reactor-netty")
optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") {
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
@ -42,26 +39,29 @@ dependencies { @@ -42,26 +39,29 @@ dependencies {
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
}
optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
testCompile("io.projectreactor:reactor-test")
testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.projectreactor:reactor-test")
testCompile("io.reactivex:rxnetty-http:0.5.2") {
exclude group: 'io.reactivex', module: 'rxjava'
}
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.undertow:undertow-core:${undertowVersion}")
testCompile("io.reactivex:rxnetty-http:0.5.2") {
exclude group: 'io.reactivex', module: 'rxjava'
}
testCompile("com.fasterxml:aalto-xml:1.0.0")
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
testRuntime("org.jruby:jruby:9.1.12.0")
testRuntime("org.jruby:jruby:9.1.13.0")
testRuntime("org.python:jython-standalone:2.7.1")
testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
testRuntime("org.webjars:underscorejs:1.8.3")

12
spring-webmvc/spring-webmvc.gradle

@ -26,11 +26,11 @@ dependencies { @@ -26,11 +26,11 @@ dependencies {
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
optional("org.apache.poi:poi-ooxml:3.16")
optional('org.webjars:webjars-locator:0.32-1')
optional("com.rometools:rome:1.8.0")
optional("com.lowagie:itext:2.1.7")
optional("com.rometools:rome:1.7.4")
optional("org.apache.poi:poi-ooxml:3.17")
optional("org.freemarker:freemarker:${freemarkerVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
@ -52,7 +52,7 @@ dependencies { @@ -52,7 +52,7 @@ dependencies {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
exclude group: "org.springframework", module: "spring-web"
}
optional('org.webjars:webjars-locator:0.32-1')
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
optional("org.reactivestreams:reactive-streams")
@ -70,7 +70,7 @@ dependencies { @@ -70,7 +70,7 @@ dependencies {
testCompile("commons-fileupload:commons-fileupload:1.3.3")
testCompile("commons-io:commons-io:2.5")
testCompile("joda-time:joda-time:2.9.9")
testCompile("org.mozilla:rhino:1.7.7.1")
testCompile("org.mozilla:rhino:1.7.7.2")
testCompile("dom4j:dom4j:1.6.1") {
exclude group: "xml-apis", module: "xml-apis"
}
@ -86,7 +86,7 @@ dependencies { @@ -86,7 +86,7 @@ dependencies {
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
testRuntime("org.jruby:jruby:9.1.12.0")
testRuntime("org.jruby:jruby:9.1.13.0")
testRuntime("org.python:jython-standalone:2.7.1")
testRuntime("org.webjars:underscorejs:1.8.3")
testRuntime("org.glassfish:javax.el:3.0.1-b08")

Loading…
Cancel
Save