aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas <>2023-01-12 07:43:15 +0100
committerThomas <>2023-01-12 07:43:15 +0100
commitb35bdd12f605dc1017b4ac892a8e033e25e685c1 (patch)
tree8792fae804030b667bccae89bca79f2158174ee1
parent42e68c8f3e53b34663d2fe9c434b0b034ff9ddf0 (diff)
downloadpdf-as-4-b35bdd12f605dc1017b4ac892a8e033e25e685c1.tar.gz
pdf-as-4-b35bdd12f605dc1017b4ac892a8e033e25e685c1.tar.bz2
pdf-as-4-b35bdd12f605dc1017b4ac892a8e033e25e685c1.zip
build(core): update third-party libs
-rw-r--r--build.gradle6
-rw-r--r--pdf-as-cli/build.gradle2
-rw-r--r--pdf-as-common/build.gradle4
-rw-r--r--pdf-as-lib/build.gradle20
-rw-r--r--pdf-as-lib/libs/bcprov-jdk15on-159.jarbin4092400 -> 0 bytes
-rw-r--r--pdf-as-lib/libs/iaik_jce_full-5.63_moa.jar (renamed from pdf-as-lib/libs/iaik_jce_full-5.62_moa.jar)bin1341167 -> 1394182 bytes
-rw-r--r--pdf-as-lib/src/main/resources/config/config.zipbin1277320 -> 1277320 bytes
-rw-r--r--pdf-as-pdfbox-2/build.gradle12
-rw-r--r--pdf-as-web-db/build.gradle6
-rw-r--r--pdf-as-web-status/build.gradle2
-rw-r--r--pdf-as-web/build.gradle12
11 files changed, 32 insertions, 32 deletions
diff --git a/build.gradle b/build.gradle
index e990df14..449802e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ allprojects {
url "https://repo.spring.io/milestone/"
}
}
- version = '4.2.1-SNAPSHOT'
+ version = '4.3.0-SNAPSHOT'
}
subprojects {
@@ -84,8 +84,8 @@ subprojects {
//tomcatVersion = '7.0.54';
//tomcatVersion = '8.0.36';
tomcatVersion = '9.0.46';
- slf4jVersion = '1.7.32'
- cxfVersion = '3.4.5'
+ slf4jVersion = '1.7.36'
+ cxfVersion = '3.5.5'
}
jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version }
diff --git a/pdf-as-cli/build.gradle b/pdf-as-cli/build.gradle
index 2854000f..94087093 100644
--- a/pdf-as-cli/build.gradle
+++ b/pdf-as-cli/build.gradle
@@ -35,7 +35,7 @@ dependencies {
implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
implementation group: 'commons-cli', name: 'commons-cli', version: '1.2'
implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
- implementation 'ch.qos.logback:logback-classic:1.2.10'
+ implementation 'ch.qos.logback:logback-classic:1.2.11'
testImplementation group: 'junit', name: 'junit', version: '4.+'
}
diff --git a/pdf-as-common/build.gradle b/pdf-as-common/build.gradle
index b57f9b6f..2af41031 100644
--- a/pdf-as-common/build.gradle
+++ b/pdf-as-common/build.gradle
@@ -22,8 +22,8 @@ releases.dependsOn sourcesJar
dependencies {
api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
api group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
- api group: 'commons-io', name: 'commons-io', version: '2.8.0'
- api group: 'ognl', name: 'ognl', version: '3.2.19'
+ api group: 'commons-io', name: 'commons-io', version: '2.11.0'
+ api group: 'ognl', name: 'ognl', version: '3.3.4'
api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
api 'commons-codec:commons-codec:1.15'
api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3'
diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle
index cff40ef0..7d92a613 100644
--- a/pdf-as-lib/build.gradle
+++ b/pdf-as-lib/build.gradle
@@ -63,26 +63,26 @@ repositories {
dependencies {
api project (':pdf-as-common')
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
- api group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.13'
- api group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
- api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.68'
+ api group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.14'
+ api group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
+ api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.70'
api group: 'javax.activation', name: 'activation', version: '1.1.1'
api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
- api group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
- api group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.7.6'
- api group: 'commons-io', name: 'commons-io', version: '2.8.0'
+ api group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
+ api group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.9.2'
+ api group: 'commons-io', name: 'commons-io', version: '2.11.0'
api group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3'
api 'org.apache.commons:commons-collections4:4.4'
- api group: 'ognl', name: 'ognl', version: '3.2.19'
+ api group: 'ognl', name: 'ognl', version: '3.3.4'
api files('libs/iaik_eccelerate_cms-6.02.jar')
api files('libs/iaik_eccelerate-6.02.jar')
- api files('libs/iaik_jce_full-5.62_moa.jar')
+ api files('libs/iaik_jce_full-5.63_moa.jar')
api files('libs/iaik_cms-5.1.1.jar')
api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
api group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4jVersion
- api group: 'com.google.zxing', name: 'core', version: '3.4.1'
- api group: 'com.google.zxing', name: 'javase', version: '3.4.1'
+ api group: 'com.google.zxing', name: 'core', version: '3.5.1'
+ api group: 'com.google.zxing', name: 'javase', version: '3.5.1'
testImplementation group: 'junit', name: 'junit', version: '4.+'
testCompile "junit:junit:4.13.2"
ws group: 'org.apache.cxf', name: 'cxf-tools', version: cxfVersion
diff --git a/pdf-as-lib/libs/bcprov-jdk15on-159.jar b/pdf-as-lib/libs/bcprov-jdk15on-159.jar
deleted file mode 100644
index 9049e565..00000000
--- a/pdf-as-lib/libs/bcprov-jdk15on-159.jar
+++ /dev/null
Binary files differ
diff --git a/pdf-as-lib/libs/iaik_jce_full-5.62_moa.jar b/pdf-as-lib/libs/iaik_jce_full-5.63_moa.jar
index 382593e4..cf4a2dd8 100644
--- a/pdf-as-lib/libs/iaik_jce_full-5.62_moa.jar
+++ b/pdf-as-lib/libs/iaik_jce_full-5.63_moa.jar
Binary files differ
diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip
index 38cc4f34..4d202aad 100644
--- a/pdf-as-lib/src/main/resources/config/config.zip
+++ b/pdf-as-lib/src/main/resources/config/config.zip
Binary files differ
diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle
index b37462bd..9d60b7b2 100644
--- a/pdf-as-pdfbox-2/build.gradle
+++ b/pdf-as-pdfbox-2/build.gradle
@@ -32,12 +32,12 @@ releases.dependsOn sourcesJar
dependencies {
implementation project (':pdf-as-lib')
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
- implementation 'org.slf4j:jcl-over-slf4j:1.7.32'
- api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.25'
- api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.25'
- api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.25'
- implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
- implementation group: 'ognl', name: 'ognl', version: '3.2.19'
+ implementation 'org.slf4j:jcl-over-slf4j:1.7.35'
+ api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.27'
+ api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.27'
+ api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.27'
+ implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
+ implementation group: 'ognl', name: 'ognl', version: '3.3.4'
testImplementation group: 'junit', name: 'junit', version: '4.+'
api group: 'com.github.jai-imageio', name: 'jai-imageio-jpeg2000', version: '1.4.0'
diff --git a/pdf-as-web-db/build.gradle b/pdf-as-web-db/build.gradle
index 6f252a32..db84074c 100644
--- a/pdf-as-web-db/build.gradle
+++ b/pdf-as-web-db/build.gradle
@@ -17,9 +17,9 @@ dependencies {
implementation project (':pdf-as-web')
implementation project (':pdf-as-web-status')
implementation project (':pdf-as-web-statistic-api')
- api "org.hibernate:hibernate-core:5.6.2.Final"
- api "org.hibernate:hibernate-entitymanager:5.6.2.Final"
- implementation 'ch.qos.logback:logback-classic:1.2.10'
+ api "org.hibernate:hibernate-core:5.6.14.Final"
+ api "org.hibernate:hibernate-entitymanager:5.6.14.Final"
+ implementation 'ch.qos.logback:logback-classic:1.2.11'
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
testImplementation group: 'junit', name: 'junit', version: '4.+'
}
diff --git a/pdf-as-web-status/build.gradle b/pdf-as-web-status/build.gradle
index c9812956..ffdf0d49 100644
--- a/pdf-as-web-status/build.gradle
+++ b/pdf-as-web-status/build.gradle
@@ -22,7 +22,7 @@ sourceSets.test.runtimeClasspath += configurations.providedCompile
dependencies {
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
- implementation 'org.apache.commons:commons-lang3:3.3.2'
+ implementation 'org.apache.commons:commons-lang3:3.12.0'
compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
testImplementation group: 'junit', name: 'junit', version: '4.+'
}
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle
index ad434bcf..efe05998 100644
--- a/pdf-as-web/build.gradle
+++ b/pdf-as-web/build.gradle
@@ -58,7 +58,7 @@ dependencies {
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'
@@ -66,12 +66,12 @@ dependencies {
api "commons-codec:commons-codec:1.15"
api 'org.apache.commons:commons-lang3:3.12.0'
api group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
- api 'org.apache.cxf:cxf-rt-transports-http:3.4.5'
- api 'org.apache.cxf:cxf-rt-frontend-jaxws:3.4.5'
+ 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'
compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.24'