From 67828b1bd63a05b593f17b6ed1c84e6953865d55 Mon Sep 17 00:00:00 2001 From: emusic Date: Mon, 15 Jul 2019 14:54:48 +0200 Subject: adding replacements for deprecated modules in Java 9 and 11 --- build.gradle | 2 +- pdf-as-cli/build.gradle | 2 +- pdf-as-common/build.gradle | 1 + pdf-as-lib/build.gradle | 7 ++++--- pdf-as-moa/build.gradle | 2 ++ pdf-as-pdfbox-2/build.gradle | 2 ++ pdf-as-pdfbox/build.gradle | 2 ++ pdf-as-tests/build.gradle | 3 +++ pdf-as-web/build.gradle | 6 +++++- 9 files changed, 21 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index b763bc5a..b13c5f17 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ task wrapper(type: Wrapper) { allprojects { apply plugin: 'com.github.ben-manes.versions' repositories { mavenCentral() } - version = '4.1.6-SNAPSHOT' + version = '4.1.61-SNAPSHOT' } configurations { diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle index 9fc614fd..fcde3b78 100644 --- a/pdf-as-cli/build.gradle +++ b/pdf-as-cli/build.gradle @@ -40,8 +40,8 @@ dependencies { pdfBox2Compile project (':pdf-as-pdfbox-2') compile group: 'commons-collections', name: 'commons-collections', version: '3.2' compile group: 'commons-cli', name: 'commons-cli', version: '1.2' + compile group: 'javax.activation', name: 'activation', version: '1.1.1' compile 'ch.qos.logback:logback-classic:1.1.2' - testCompile group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-common/build.gradle b/pdf-as-common/build.gradle index 0190c859..b466fbcd 100644 --- a/pdf-as-common/build.gradle +++ b/pdf-as-common/build.gradle @@ -24,6 +24,7 @@ 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 'commons-codec:commons-codec:1.10' testCompile group: 'junit', name: 'junit', version: '4.+' diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle index bdb96949..1691e6d6 100644 --- a/pdf-as-lib/build.gradle +++ b/pdf-as-lib/build.gradle @@ -58,13 +58,13 @@ dependencies { compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.3.2' compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.3.5' 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: '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 'org.apache.commons:commons-collections4:4.0' compile group: 'ognl', name: 'ognl', version: '3.0.8' compile files('libs/iaik_eccelerate_cms.jar') @@ -78,6 +78,7 @@ dependencies { 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 + } task wsdl2Java() { diff --git a/pdf-as-moa/build.gradle b/pdf-as-moa/build.gradle index 7d741f9f..f8ec4ee5 100644 --- a/pdf-as-moa/build.gradle +++ b/pdf-as-moa/build.gradle @@ -47,10 +47,12 @@ 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' 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' } task wsdl2Java() { diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle index 2ecd2a66..6f885190 100644 --- a/pdf-as-pdfbox-2/build.gradle +++ b/pdf-as-pdfbox-2/build.gradle @@ -42,6 +42,8 @@ dependencies { compile group: 'com.github.jai-imageio', name: 'jai-imageio-jpeg2000', version: '1.3.0' compile group: 'com.github.jai-imageio', name: 'jai-imageio-core', version: '1.3.1' compile group: 'com.levigo.jbig2', name: 'levigo-jbig2-imageio', version: '1.6.5' + compile group: 'javax.activation', name: 'activation', version: '1.1.1' + } test { diff --git a/pdf-as-pdfbox/build.gradle b/pdf-as-pdfbox/build.gradle index d0778512..e6c075ee 100644 --- a/pdf-as-pdfbox/build.gradle +++ b/pdf-as-pdfbox/build.gradle @@ -26,6 +26,8 @@ dependencies { compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.11' compile group: 'commons-io', name: 'commons-io', version: '2.4' compile group: 'ognl', name: 'ognl', version: '3.0.6' + compile group: 'javax.activation', name: 'activation', version: '1.1.1' + testCompile group: 'junit', name: 'junit', version: '4.+' } diff --git a/pdf-as-tests/build.gradle b/pdf-as-tests/build.gradle index 9b14f7e2..beba0afd 100644 --- a/pdf-as-tests/build.gradle +++ b/pdf-as-tests/build.gradle @@ -34,7 +34,10 @@ dependencies { compile project (':signature-standards:sigs-pkcs7detached') compile project (':signature-standards:sigs-pades') + compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7' + compile group: 'javax.activation', name: 'activation', version: '1.1.1' + testCompile group: 'junit', name: 'junit', version: '4.+' testCompile group: 'org.icepdf', name: 'icepdf-core', version: '5.0.7' diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 87e303af..a59d4379 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -48,12 +48,16 @@ dependencies { pdfbox1 project (':pdf-as-pdfbox') compile project (':pdf-as-web-status') compile project (':pdf-as-web-statistic-api') + compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1' compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.3' 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 "commons-codec:commons-codec:1.9" + compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1' + compile group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' + + 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' compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.0.1' -- cgit v1.2.3