aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web
diff options
context:
space:
mode:
authorGerald Palfinger <gerald.palfinger@iaik.tugraz.at>2022-01-20 14:20:41 +0000
committerGerald Palfinger <gerald.palfinger@iaik.tugraz.at>2022-01-20 14:20:41 +0000
commit863eef9357f985936f0e72a267232fbd42315d95 (patch)
treeb47bbb1f43d250b4a009aa5fe9b3a013ffe5a292 /pdf-as-web
parent70efc77fb1ba95a74ad8c7ce6ad097de35d208e2 (diff)
parent228b1e2dc09d9554edcd667c68325709d1fb0d3e (diff)
downloadpdf-as-4-863eef9357f985936f0e72a267232fbd42315d95.tar.gz
pdf-as-4-863eef9357f985936f0e72a267232fbd42315d95.tar.bz2
pdf-as-4-863eef9357f985936f0e72a267232fbd42315d95.zip
Merge branch 'issue_58' into 'master'
Update all vulnerable dependencies See merge request egiz/pdf-as-4!1
Diffstat (limited to 'pdf-as-web')
-rw-r--r--pdf-as-web/build.gradle27
-rw-r--r--pdf-as-web/gradle.properties3
2 files changed, 15 insertions, 15 deletions
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle
index f6479d55..cf14365b 100644
--- a/pdf-as-web/build.gradle
+++ b/pdf-as-web/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
apply plugin: 'eclipse-wtp'
apply plugin: 'war'
-apply plugin: 'org.akhikhl.gretty'
+apply plugin: 'org.gretty'
buildscript {
repositories {
@@ -16,7 +16,7 @@ buildscript {
}
dependencies {
- classpath 'org.akhikhl.gretty:gretty:+'
+ classpath 'org.gretty:gretty:3.0.7'
}
}
@@ -51,18 +51,20 @@ dependencies {
api project (':signature-standards:sigs-pades')
api project (':pdf-as-web-status')
api project (':pdf-as-web-statistic-api')
- api group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1'
+ 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: '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.1'
- api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.1'
- api 'com.thetransactioncompany:cors-filter:2.9.1'
- api 'ch.qos.logback:logback-classic:1.2.3'
- api 'ch.qos.logback:logback-core:1.2.3'
+ api 'org.apache.cxf:cxf-rt-transports-http:3.4.5'
+ api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.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 group: 'javax.jws', name: 'javax.jws-api', version: '1.1'
pdfbox2 project (':pdf-as-pdfbox-2')
@@ -72,8 +74,8 @@ dependencies {
gretty {
// supported values:
- // 'jetty7', 'jetty8', 'jetty9', 'tomcat7', 'tomcat8'
- servletContainer = 'jetty9'
+ // 'jetty7', 'jetty8', 'jetty9', 'jetty9.3', 'jetty9.4', 'tomcat85', 'tomcat9'
+ servletContainer = 'tomcat85'
jvmArgs = [ '-Dpdf-as-web.conf=' + System.getProperty("user.home") + '/.pdfas/pdf-as-web.properties' ]
}
@@ -272,13 +274,8 @@ task releases(dependsOn: buildTomcat, type: Copy) {
from archive
from tararchive
into rootDir.toString() + "/releases/" + version
-
-
-
}
-
-
releases.dependsOn jar
releases.dependsOn sourcesJar
releases.dependsOn war
diff --git a/pdf-as-web/gradle.properties b/pdf-as-web/gradle.properties
new file mode 100644
index 00000000..887ae74e
--- /dev/null
+++ b/pdf-as-web/gradle.properties
@@ -0,0 +1,3 @@
+jetty94Version = 9.4.44.v20210927
+jetty93Version = 9.3.30.v20211001
+jetty9Version = 9.2.30.v20200428 \ No newline at end of file