diff options
| author | Thomas Lenz <thomas.lenz@iaik.tugraz.at> | 2023-01-12 12:26:00 +0000 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@iaik.tugraz.at> | 2023-01-12 12:26:00 +0000 |
| commit | ab328e055e01b12a91c8ccee4ac0cbea3e0fb282 (patch) | |
| tree | e0c57f79dc1a57d3f6c4e3af1d982b750bad96f9 /pdf-as-web/build.gradle | |
| parent | 74668d9f7e8cfb9c729e804067984d0f5e731f2f (diff) | |
| parent | e78fccac558a93f18bae96ddb6c8e131afaf946d (diff) | |
| download | pdf-as-4-ab328e055e01b12a91c8ccee4ac0cbea3e0fb282.tar.gz pdf-as-4-ab328e055e01b12a91c8ccee4ac0cbea3e0fb282.tar.bz2 pdf-as-4-ab328e055e01b12a91c8ccee4ac0cbea3e0fb282.zip | |
Merge branch 'development' into 'feature/issue_73'
# Conflicts:
# build.gradle
# pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java
Diffstat (limited to 'pdf-as-web/build.gradle')
| -rw-r--r-- | pdf-as-web/build.gradle | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index cf14365b..efe05998 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -12,7 +12,7 @@ buildscript { // maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' } maven { url "https://plugins.gradle.org/m2/" - } + } } dependencies { @@ -36,6 +36,9 @@ jar { repositories { mavenLocal() mavenCentral() + maven { + url "https://repo.spring.io/milestone/" + } } @@ -45,31 +48,37 @@ sourceSets.test.runtimeClasspath += configurations.providedCompile dependencies { + api project (':pdf-as-common') api project (':pdf-as-lib') api project (':pdf-as-moa') api project (':signature-standards:sigs-pkcs7detached') api project (':signature-standards:sigs-pades') api project (':pdf-as-web-status') api project (':pdf-as-web-statistic-api') + api project (':pdf-as-pdfbox-2') api group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4' // Upgrade dependency of commons-fileupload from 2.2 to 2.8.0 to avoid CVE-2021-29425 - api group: 'commons-io', name: 'commons-io', version: '2.8.0' + api group: 'commons-io', name: 'commons-io', version: '2.11.0' api group: 'opensymphony', name: 'sitemesh', version: '2.4.2' api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' api group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1' api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3' api "commons-codec:commons-codec:1.15" api 'org.apache.commons:commons-lang3:3.12.0' - api 'org.apache.cxf:cxf-rt-transports-http:3.4.5' - api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5' + api group: 'org.apache.commons', name: 'commons-collections4', version: '4.4' + api 'org.apache.cxf:cxf-rt-transports-http:3.5.5' + api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.5.5' api 'com.thetransactioncompany:cors-filter:2.10' - api 'ch.qos.logback:logback-classic:1.2.10' - api 'ch.qos.logback:logback-core:1.2.10' - api 'org.json:json:20210307' + api 'ch.qos.logback:logback-classic:1.2.11' + api 'ch.qos.logback:logback-core:1.2.11' + api 'org.json:json:20220924' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' - pdfbox2 project (':pdf-as-pdfbox-2') compileOnly 'javax.servlet:javax.servlet-api:3.0.1' + compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.24' + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.24' testImplementation group: 'junit', name: 'junit', version: '4.+' + testRuntime 'org.springframework:spring-test:5.2.22.RELEASE' + } gretty { |