aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web
diff options
context:
space:
mode:
authorEmina Ahmetovic <emina.ahmetovic@egiz.gv.at>2020-10-30 09:37:01 +0100
committerEmina Ahmetovic <emina.ahmetovic@egiz.gv.at>2020-10-30 09:37:01 +0100
commitcbaa725f4940ba0677feaa76a4556c1d9a14efc5 (patch)
treea22a629d998ad61d6f5cbeec8b439245731ef4bf /pdf-as-web
parent7f66428916800f37fcc3ea67310d2ef73eb2fa38 (diff)
parent587b3c52aff9eaca6f02279a5976aeeadf08c124 (diff)
downloadpdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.gz
pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.bz2
pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.zip
resolving merge conflicts
Diffstat (limited to 'pdf-as-web')
-rw-r--r--pdf-as-web/build.gradle6
1 files changed, 3 insertions, 3 deletions
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle
index 27ed77eb..f714d621 100644
--- a/pdf-as-web/build.gradle
+++ b/pdf-as-web/build.gradle
@@ -50,9 +50,9 @@ dependencies {
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: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21'
+ compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21'
+ compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21'
compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
compile group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1'