From 17184b83bf076039c2ec3a5218fb190f4f177201 Mon Sep 17 00:00:00 2001 From: emusic Date: Thu, 7 Nov 2019 11:01:30 +0100 Subject: Update Java 9-11 dependencies --- pdf-as-common/build.gradle | 3 ++- pdf-as-lib/build.gradle | 4 +++- pdf-as-moa/build.gradle | 3 ++- pdf-as-web/build.gradle | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pdf-as-common/build.gradle b/pdf-as-common/build.gradle index b466fbcd..4d5a0390 100644 --- a/pdf-as-common/build.gradle +++ b/pdf-as-common/build.gradle @@ -24,8 +24,9 @@ dependencies { compile group: 'commons-collections', name: 'commons-collections', version: '3.2' compile group: 'commons-io', name: 'commons-io', version: '2.4' compile group: 'ognl', name: 'ognl', version: '3.0.6' - compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1' + compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' compile 'commons-codec:commons-codec:1.10' + compile group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.4.0-b180830.0438' testCompile group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle index 1691e6d6..a796c5db 100644 --- a/pdf-as-lib/build.gradle +++ b/pdf-as-lib/build.gradle @@ -60,11 +60,13 @@ dependencies { compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5' compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.59' compile group: 'javax.activation', name: 'activation', version: '1.1.1' - compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1' + compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' compile group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.6.3' compile group: 'commons-io', name: 'commons-io', version: '2.4' + compile group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.4.0-b180830.0438' + compile 'org.apache.commons:commons-collections4:4.0' compile group: 'ognl', name: 'ognl', version: '3.0.8' compile files('libs/iaik_eccelerate_cms.jar') diff --git a/pdf-as-moa/build.gradle b/pdf-as-moa/build.gradle index f8ec4ee5..5fbb5088 100644 --- a/pdf-as-moa/build.gradle +++ b/pdf-as-moa/build.gradle @@ -47,12 +47,13 @@ repositories { dependencies { compile project (':pdf-as-lib') compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion - compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1' + compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' testCompile group: 'junit', name: 'junit', version: '4.+' ws group: 'org.apache.cxf', name: 'cxf-tools', version: cxfVersion ws group: 'org.apache.cxf', name: 'cxf-tools-wsdlto-databinding-jaxb', version: cxfVersion ws group: 'org.apache.cxf', name: 'cxf-tools-wsdlto-frontend-jaxws', version: cxfVersion compile group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' + compile group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.4.0-b180830.0438' } task wsdl2Java() { diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index a59d4379..164925ad 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -54,9 +54,11 @@ dependencies { compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.3' compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.3' compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2' - compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1' + compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' compile group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' + compile group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.4.0-b180830.0438' + compile "commons-codec:commons-codec:1.9" compile 'org.apache.commons:commons-lang3:3.3.2' compile 'org.apache.cxf:cxf-rt-transports-http:3.0.1' -- cgit v1.2.3