diff options
author | Emina Ahmetovic <emina.ahmetovic@egiz.gv.at> | 2020-10-30 09:37:01 +0100 |
---|---|---|
committer | Emina Ahmetovic <emina.ahmetovic@egiz.gv.at> | 2020-10-30 09:37:01 +0100 |
commit | cbaa725f4940ba0677feaa76a4556c1d9a14efc5 (patch) | |
tree | a22a629d998ad61d6f5cbeec8b439245731ef4bf /pdf-as-tests | |
parent | 7f66428916800f37fcc3ea67310d2ef73eb2fa38 (diff) | |
parent | 587b3c52aff9eaca6f02279a5976aeeadf08c124 (diff) | |
download | pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.gz pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.bz2 pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.zip |
resolving merge conflicts
Diffstat (limited to 'pdf-as-tests')
-rw-r--r-- | pdf-as-tests/build.gradle | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pdf-as-tests/build.gradle b/pdf-as-tests/build.gradle index 8d5129ff..57dd84ab 100644 --- a/pdf-as-tests/build.gradle +++ b/pdf-as-tests/build.gradle @@ -42,13 +42,13 @@ dependencies { testCompile group: 'org.icepdf', name: 'icepdf-core', version: '5.0.7' pdfBox1Compile project (':pdf-as-pdfbox') - pdfBox1Compile group: 'org.apache.pdfbox', name: 'preflight', version: '1.8.7' - pdfBox1Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.7' + pdfBox1Compile group: 'org.apache.pdfbox', name: 'preflight', version: '1.8.16' + pdfBox1Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.16' pdfBox2Compile project (':pdf-as-pdfbox-2') - pdfBox2Compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.2' - pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.2' - pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.2' + pdfBox2Compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21' + pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21' + pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21' } |