From 9aae8448405c93c5384be3a33b52bd4434faf972 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 13:28:33 +0100 Subject: Update dependencies --- pdf-as-web/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index f6479d55..eac334af 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -58,11 +58,11 @@ dependencies { 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.7' + api 'ch.qos.logback:logback-core:1.2.7' api 'org.json:json:20210307' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' pdfbox2 project (':pdf-as-pdfbox-2') -- cgit v1.2.3 From 66edcf7bab6a846617b77db54a89fab624d87df5 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 14:22:24 +0100 Subject: Update dependencies --- pdf-as-web/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index eac334af..4ba67e18 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -51,7 +51,7 @@ 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' 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' -- cgit v1.2.3 From 9cbe202087a5bb0291b676c916426f0ba50229cc Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Mon, 13 Dec 2021 15:35:46 +0100 Subject: Update gretty --- pdf-as-web/build.gradle | 8 ++++---- pdf-as-web/gradle.properties | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 pdf-as-web/gradle.properties (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 4ba67e18..efcb263e 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' } } @@ -72,8 +72,8 @@ dependencies { gretty { // supported values: - // 'jetty7', 'jetty8', 'jetty9', 'tomcat7', 'tomcat8' - servletContainer = 'jetty9' + // 'jetty7', 'jetty8', 'jetty9', 'jetty9.3', 'jetty9.4', 'tomcat8.5', 'tomcat9' + servletContainer = 'jetty9.4' jvmArgs = [ '-Dpdf-as-web.conf=' + System.getProperty("user.home") + '/.pdfas/pdf-as-web.properties' ] } 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 -- cgit v1.2.3 From 4eb673f1d100423ad7a892460b1f11938173db47 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Tue, 14 Dec 2021 12:38:59 +0100 Subject: Use Tomcat --- pdf-as-web/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index efcb263e..6337a448 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -72,8 +72,8 @@ dependencies { gretty { // supported values: - // 'jetty7', 'jetty8', 'jetty9', 'jetty9.3', 'jetty9.4', 'tomcat8.5', 'tomcat9' - servletContainer = 'jetty9.4' + // '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' ] } -- cgit v1.2.3 From f16b75cde0083d4325c702e152e9ade8c4725164 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Thu, 16 Dec 2021 13:07:52 +0100 Subject: Update logback --- pdf-as-web/build.gradle | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 6337a448..3d43861b 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -61,8 +61,8 @@ dependencies { 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.7' - api 'ch.qos.logback:logback-core:1.2.7' + api 'ch.qos.logback:logback-classic:1.2.8' + api 'ch.qos.logback:logback-core:1.2.8' api 'org.json:json:20210307' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' pdfbox2 project (':pdf-as-pdfbox-2') @@ -272,13 +272,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 -- cgit v1.2.3 From 35c301bd555a0b790b2d6621ed2eff0f3bdbf400 Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Thu, 16 Dec 2021 16:25:40 +0100 Subject: Update commons-io --- pdf-as-web/build.gradle | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 3d43861b..4752ed67 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -52,6 +52,8 @@ dependencies { api project (':pdf-as-web-status') api project (':pdf-as-web-statistic-api') 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' -- cgit v1.2.3 From 4cb2ff10b3925c9234b8090b08fbd68584617ada Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Wed, 22 Dec 2021 16:54:48 +0100 Subject: Update logback (CVE-2021-42550) + other dependencies --- pdf-as-web/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 4752ed67..64f17319 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -63,8 +63,8 @@ dependencies { 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.8' - api 'ch.qos.logback:logback-core:1.2.8' + api 'ch.qos.logback:logback-classic:1.2.9' + api 'ch.qos.logback:logback-core:1.2.9' api 'org.json:json:20210307' api group: 'javax.jws', name: 'javax.jws-api', version: '1.1' pdfbox2 project (':pdf-as-pdfbox-2') -- cgit v1.2.3 From 228b1e2dc09d9554edcd667c68325709d1fb0d3e Mon Sep 17 00:00:00 2001 From: Gerald Palfinger Date: Thu, 23 Dec 2021 12:29:40 +0100 Subject: Update logback --- pdf-as-web/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pdf-as-web') diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index 64f17319..cf14365b 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -63,8 +63,8 @@ dependencies { 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.9' - api 'ch.qos.logback:logback-core:1.2.9' + 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') -- cgit v1.2.3