提交 3616e967 编写于 作者: J Juergen Hoeller

Upgrade to SLF4J 1.7.28, Groovy 2.5.8, RxJava 2.2.12, Joda-Time 2.10.4, Rome...

Upgrade to SLF4J 1.7.28, Groovy 2.5.8, RxJava 2.2.12, Joda-Time 2.10.4, Rome 1.12.2, OkHttp 3.14.3, Apache HttpClient 4.5.10, Apache Johnzon 1.1.13
上级 357beb24
...@@ -30,7 +30,7 @@ ext { ...@@ -30,7 +30,7 @@ ext {
aspectjVersion = "1.9.4" aspectjVersion = "1.9.4"
freemarkerVersion = "2.3.28" freemarkerVersion = "2.3.28"
groovyVersion = "2.5.7" groovyVersion = "2.5.8"
hsqldbVersion = "2.4.1" hsqldbVersion = "2.4.1"
jackson2Version = "2.9.9" jackson2Version = "2.9.9"
jettyVersion = "9.4.20.v20190813" jettyVersion = "9.4.20.v20190813"
...@@ -41,8 +41,8 @@ ext { ...@@ -41,8 +41,8 @@ ext {
reactorVersion = "Californium-SR12" reactorVersion = "Californium-SR12"
rxjavaVersion = "1.3.8" rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1" rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.2.10" rxjava2Version = "2.2.12"
slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps slf4jVersion = "1.7.28" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8" tiles3Version = "3.0.8"
tomcatVersion = "9.0.26" tomcatVersion = "9.0.26"
undertowVersion = "2.0.26.Final" undertowVersion = "2.0.26.Final"
......
...@@ -19,7 +19,7 @@ dependencies { ...@@ -19,7 +19,7 @@ dependencies {
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.codehaus.groovy:groovy:${groovyVersion}")
optional("org.beanshell:bsh:2.0b5") optional("org.beanshell:bsh:2.0b5")
optional("joda-time:joda-time:2.10.1") optional("joda-time:joda-time:2.10.4")
optional("org.hibernate:hibernate-validator:5.4.3.Final") optional("org.hibernate:hibernate-validator:5.4.3.Final")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
......
...@@ -67,12 +67,12 @@ dependencies { ...@@ -67,12 +67,12 @@ dependencies {
testCompile("org.junit.jupiter:junit-jupiter-params") testCompile("org.junit.jupiter:junit-jupiter-params")
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
testCompile("com.thoughtworks.xstream:xstream:1.4.11.1") testCompile("com.thoughtworks.xstream:xstream:1.4.11.1")
testCompile("com.rometools:rome:1.12.1") testCompile("com.rometools:rome:1.12.2")
testCompile("org.apache.tiles:tiles-api:${tiles3Version}") testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j) testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j)
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j) testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j)
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.apache.httpcomponents:httpclient:4.5.9") { testCompile("org.apache.httpcomponents:httpclient:4.5.10") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
testCompile("io.projectreactor.netty:reactor-netty") testCompile("io.projectreactor.netty:reactor-netty")
......
...@@ -38,8 +38,8 @@ dependencies { ...@@ -38,8 +38,8 @@ dependencies {
exclude group: "javax.servlet", module: "javax.servlet-api" exclude group: "javax.servlet", module: "javax.servlet-api"
} }
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
optional("com.squareup.okhttp3:okhttp:3.14.2") optional("com.squareup.okhttp3:okhttp:3.14.3")
optional("org.apache.httpcomponents:httpclient:4.5.9") { optional("org.apache.httpcomponents:httpclient:4.5.10") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
optional("org.apache.httpcomponents:httpasyncclient:4.1.4") { optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {
...@@ -58,7 +58,7 @@ dependencies { ...@@ -58,7 +58,7 @@ dependencies {
optional("com.google.code.gson:gson:2.8.5") optional("com.google.code.gson:gson:2.8.5")
optional("com.google.protobuf:protobuf-java-util:3.6.1") optional("com.google.protobuf:protobuf-java-util:3.6.1")
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
optional("com.rometools:rome:1.12.1") optional("com.rometools:rome:1.12.2")
optional("com.caucho:hessian:4.0.51") optional("com.caucho:hessian:4.0.51")
optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.codehaus.groovy:groovy:${groovyVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
...@@ -75,7 +75,7 @@ dependencies { ...@@ -75,7 +75,7 @@ dependencies {
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") testCompile("com.squareup.okhttp3:mockwebserver:3.14.3")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2") testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
...@@ -83,5 +83,5 @@ dependencies { ...@@ -83,5 +83,5 @@ dependencies {
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1") testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1") testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
testRuntime("javax.json:javax.json-api:1.1.4") testRuntime("javax.json:javax.json-api:1.1.4")
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.12") testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.13")
} }
...@@ -34,7 +34,7 @@ dependencies { ...@@ -34,7 +34,7 @@ dependencies {
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") { optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec" exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
} }
optional("org.apache.httpcomponents:httpclient:4.5.9") { optional("org.apache.httpcomponents:httpclient:4.5.10") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
...@@ -51,7 +51,7 @@ dependencies { ...@@ -51,7 +51,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") testCompile("com.squareup.okhttp3:mockwebserver:3.14.3")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
......
...@@ -22,7 +22,7 @@ dependencies { ...@@ -22,7 +22,7 @@ dependencies {
optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.xml.bind:jaxb-api:2.3.1") optional("javax.xml.bind:jaxb-api:2.3.1")
optional("org.webjars:webjars-locator-core:0.37") optional("org.webjars:webjars-locator-core:0.37")
optional("com.rometools:rome:1.12.1") optional("com.rometools:rome:1.12.2")
optional("com.github.librepdf:openpdf:1.2.21") optional("com.github.librepdf:openpdf:1.2.21")
optional("org.apache.poi:poi-ooxml:4.1.0") optional("org.apache.poi:poi-ooxml:4.1.0")
optional("org.freemarker:freemarker:${freemarkerVersion}") optional("org.freemarker:freemarker:${freemarkerVersion}")
...@@ -50,12 +50,12 @@ dependencies { ...@@ -50,12 +50,12 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server") { testCompile("org.eclipse.jetty:jetty-server") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("org.apache.httpcomponents:httpclient:4.5.9") { testCompile("org.apache.httpcomponents:httpclient:4.5.10") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
testCompile("commons-fileupload:commons-fileupload:1.4") testCompile("commons-fileupload:commons-fileupload:1.4")
testCompile("commons-io:commons-io:2.5") testCompile("commons-io:commons-io:2.5")
testCompile("joda-time:joda-time:2.10.2") testCompile("joda-time:joda-time:2.10.4")
testCompile("org.mozilla:rhino:1.7.10") testCompile("org.mozilla:rhino:1.7.10")
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"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册