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-lib | |
| 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-lib')
| -rw-r--r-- | pdf-as-lib/build.gradle | 20 | ||||
| -rw-r--r-- | pdf-as-lib/libs/bcprov-jdk15on-159.jar | bin | 4092400 -> 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) | bin | 1341167 -> 1394182 bytes | |||
| -rw-r--r-- | pdf-as-lib/src/main/resources/config/config.zip | bin | 1277320 -> 1277320 bytes |
4 files changed, 10 insertions, 10 deletions
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 Binary files differdeleted file mode 100644 index 9049e565..00000000 --- a/pdf-as-lib/libs/bcprov-jdk15on-159.jar +++ /dev/null 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 Binary files differindex 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 diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip Binary files differindex 38cc4f34..4d202aad 100644 --- a/pdf-as-lib/src/main/resources/config/config.zip +++ b/pdf-as-lib/src/main/resources/config/config.zip |