From 92890232df949285fd578227f9aef9a6084d7102 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 20 Jul 2019 18:20:03 +0200 Subject: [PATCH] Upgrade to OpenPDF 1.2.21, Rome 1.12.1, XStream 1.4.11.1 Includes updated javadoc links for 5.1.x branch. --- build.gradle | 4 ++-- spring-messaging/spring-messaging.gradle | 2 +- spring-oxm/spring-oxm.gradle | 2 +- spring-test/spring-test.gradle | 4 ++-- spring-web/spring-web.gradle | 2 +- spring-webmvc/spring-webmvc.gradle | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 0da6cfdc14c..9bd63bf5ab0 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ plugins { } ext { - linkHomepage = "https://projects.spring.io/spring-framework" + linkHomepage = "https://spring.io/projects/spring-framework" linkCi = "https://build.spring.io/browse/SPR" linkIssue = "https://github.com/spring-projects/spring-framework/issues" linkScmUrl = "https://github.com/spring-projects/spring-framework" @@ -178,7 +178,7 @@ configure(allprojects) { project -> "https://docs.oracle.com/javase/8/docs/api/", "https://docs.oracle.com/javaee/7/api/", "https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ - "https://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/", + "https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/", "https://glassfish.java.net/nonav/docs/v3/api/", "https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", "https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/", diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index b8e29c0960c..5508f04b424 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/spring-messaging/spring-messaging.gradle @@ -18,7 +18,7 @@ dependencies { testCompile("javax.inject:javax.inject-tck:1") testCompile("javax.servlet:javax.servlet-api:4.0.1") testCompile("javax.validation:validation-api:1.1.0.Final") - testCompile("com.thoughtworks.xstream:xstream:1.4.10") + testCompile("com.thoughtworks.xstream:xstream:1.4.11.1") testCompile("org.apache.activemq:activemq-broker:5.8.0") testCompile("org.apache.activemq:activemq-kahadb-store:5.8.0") { exclude group: "org.springframework", module: "spring-context" diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index b401ac6be04..eefd60fe560 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/spring-oxm/spring-oxm.gradle @@ -105,7 +105,7 @@ dependencies { exclude group: "org.springframework", module: "spring-context" exclude group: "commons-logging", module: "commons-logging" } - optional("com.thoughtworks.xstream:xstream:1.4.10") { + optional("com.thoughtworks.xstream:xstream:1.4.11.1") { exclude group: "xpp3", module: "xpp3_min" exclude group: "xmlpull", module: "xmlpull" } diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index e0c35fa1483..b43e6c5a3a5 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -66,8 +66,8 @@ dependencies { testCompile("org.junit.platform:junit-platform-runner") testCompile("org.junit.jupiter:junit-jupiter-params") testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") - testCompile("com.thoughtworks.xstream:xstream:1.4.10") - testCompile("com.rometools:rome:1.12.0") + testCompile("com.thoughtworks.xstream:xstream:1.4.11.1") + testCompile("com.rometools:rome:1.12.1") testCompile("org.apache.tiles:tiles-api:${tiles3Version}") testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4j) testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4j) diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index e8445952e94..89218d26672 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -58,7 +58,7 @@ dependencies { optional("com.google.code.gson:gson:2.8.5") optional("com.google.protobuf:protobuf-java-util:3.6.1") optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") - optional("com.rometools:rome:1.12.0") + optional("com.rometools:rome:1.12.1") optional("com.caucho:hessian:4.0.51") optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 882cb72208d..7ba939852cc 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -22,8 +22,8 @@ dependencies { optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.xml.bind:jaxb-api:2.3.1") optional("org.webjars:webjars-locator-core:0.37") - optional("com.rometools:rome:1.12.0") - optional("com.github.librepdf:openpdf:1.2.17") + optional("com.rometools:rome:1.12.1") + optional("com.github.librepdf:openpdf:1.2.21") optional("org.apache.poi:poi-ooxml:4.1.0") optional("org.freemarker:freemarker:${freemarkerVersion}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")