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

Latest dependency updates (RxJava 1.2.9, JiBX 1.3.1, H2 1.4.194, JBoss Logging 3.3.1, WebJars Locator 0.32-1)

This commit is contained in:
Juergen Hoeller 2017-03-24 18:01:11 +01:00
parent 2baceac5ff
commit e644c557e7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.gradle
View File

@ -79,7 +79,7 @@ configure(allprojects) { project ->
ext.quartzVersion = "2.2.3" ext.quartzVersion = "2.2.3"
ext.reactorVersion = "Aluminium-BUILD-SNAPSHOT" ext.reactorVersion = "Aluminium-BUILD-SNAPSHOT"
ext.romeVersion = "1.7.1" ext.romeVersion = "1.7.1"
ext.rxjavaVersion = '1.2.7' ext.rxjavaVersion = '1.2.9'
ext.rxjavaAdapterVersion = '1.2.1' ext.rxjavaAdapterVersion = '1.2.1'
ext.rxjava2Version = '2.0.7' ext.rxjava2Version = '2.0.7'
ext.rxnettyVersion = '0.5.2' ext.rxnettyVersion = '0.5.2'
@ -570,7 +570,7 @@ project("spring-oxm") {
exclude group: 'xpp3', module: 'xpp3_min' exclude group: 'xpp3', module: 'xpp3_min'
exclude group: 'xmlpull', module: 'xmlpull' exclude group: 'xmlpull', module: 'xmlpull'
} }
optional("org.jibx:jibx-run:1.2.6") optional("org.jibx:jibx-run:1.3.1")
testCompile(project(":spring-context")) testCompile(project(":spring-context"))
testCompile("xpp3:xpp3:1.1.4c") testCompile("xpp3:xpp3:1.1.4c")
testCompile("org.codehaus.jettison:jettison:1.3.8") { testCompile("org.codehaus.jettison:jettison:1.3.8") {
@ -680,7 +680,7 @@ project("spring-jdbc") {
optional(project(":spring-context")) // for JndiDataSourceLookup optional(project(":spring-context")) // for JndiDataSourceLookup
optional("javax.transaction:javax.transaction-api:${jtaVersion}") optional("javax.transaction:javax.transaction-api:${jtaVersion}")
optional("org.hsqldb:hsqldb:${hsqldbVersion}") optional("org.hsqldb:hsqldb:${hsqldbVersion}")
optional("com.h2database:h2:1.4.193") optional("com.h2database:h2:1.4.194")
optional("org.apache.derby:derby:10.13.1.1") optional("org.apache.derby:derby:10.13.1.1")
optional("org.apache.derby:derbyclient:10.13.1.1") optional("org.apache.derby:derbyclient:10.13.1.1")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
@ -806,7 +806,7 @@ project("spring-web") {
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}") testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}") testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}") testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}")
testRuntime("org.jboss.logging:jboss-logging:3.3.0.Final") testRuntime("org.jboss.logging:jboss-logging:3.3.1.Final")
} }
if (JavaVersion.current().java9Compatible) { if (JavaVersion.current().java9Compatible) {
@ -829,7 +829,7 @@ project("spring-webflux") {
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("org.freemarker:freemarker:${freemarkerVersion}") optional("org.freemarker:freemarker:${freemarkerVersion}")
optional "org.apache.httpcomponents:httpclient:${httpclientVersion}" optional "org.apache.httpcomponents:httpclient:${httpclientVersion}"
optional('org.webjars:webjars-locator:0.32') optional('org.webjars:webjars-locator:0.32-1')
optional("io.projectreactor.ipc:reactor-netty") optional("io.projectreactor.ipc:reactor-netty")
optional("io.reactivex:rxnetty-http:${rxnettyVersion}") { optional("io.reactivex:rxnetty-http:${rxnettyVersion}") {
exclude group: 'io.reactivex', module: 'rxjava' exclude group: 'io.reactivex', module: 'rxjava'
@ -869,7 +869,7 @@ project("spring-webflux") {
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}") testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("javax.activation:activation:${activationApiVersion}") testRuntime("javax.activation:activation:${activationApiVersion}")
testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}") testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}")
testRuntime("org.jboss.logging:jboss-logging:3.3.0.Final") testRuntime("org.jboss.logging:jboss-logging:3.3.1.Final")
testRuntime("org.webjars:underscorejs:1.8.3") testRuntime("org.webjars:underscorejs:1.8.3")
testRuntime("org.jruby:jruby:9.1.8.0") testRuntime("org.jruby:jruby:9.1.8.0")
testRuntime("org.python:jython-standalone:2.5.3") testRuntime("org.python:jython-standalone:2.5.3")
@ -954,7 +954,7 @@ project("spring-webmvc") {
exclude group: "org.slf4j", module: "jcl-over-slf4j" exclude group: "org.slf4j", module: "jcl-over-slf4j"
exclude group: "org.springframework", module: "spring-web" exclude group: "org.springframework", module: "spring-web"
} }
optional('org.webjars:webjars-locator:0.32') optional('org.webjars:webjars-locator:0.32-1')
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}") testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
testCompile("dom4j:dom4j:1.6.1") { testCompile("dom4j:dom4j:1.6.1") {
exclude group: "xml-apis", module: "xml-apis" exclude group: "xml-apis", module: "xml-apis"
@ -1035,7 +1035,7 @@ project("spring-websocket") {
testCompile("io.netty:netty-all:${nettyVersion}") testCompile("io.netty:netty-all:${nettyVersion}")
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}") testRuntime("org.jboss.xnio:xnio-nio:${xnioVersion}")
testRuntime("org.jboss.logging:jboss-logging:3.3.0.Final") testRuntime("org.jboss.logging:jboss-logging:3.3.1.Final")
} }
if (JavaVersion.current().java9Compatible) { if (JavaVersion.current().java9Compatible) {

2
spring-oxm/oxm.gradle
View File

@ -6,7 +6,7 @@ configurations {
dependencies { dependencies {
castor "org.codehaus.castor:castor-anttasks:1.4.1" castor "org.codehaus.castor:castor-anttasks:1.4.1"
jibx "org.jibx:jibx-bind:1.2.6" jibx "org.jibx:jibx-bind:1.3.1"
jibx "org.apache.bcel:bcel:6.0" jibx "org.apache.bcel:bcel:6.0"
xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11' xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11'
xjc 'javax.xml.bind:jaxb-api:2.2.11' xjc 'javax.xml.bind:jaxb-api:2.2.11'