diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2025-08-06 08:02:33 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2025-08-06 08:02:33 +0200 |
| commit | 773535ab90950460f468d2edfc5be396f2776d25 (patch) | |
| tree | f1e1c9841d5094d420d3a9b15a9fb6cdd684f986 /moaSig/common | |
| parent | 98967fdd5649dafabc4b225a0496cab4ec034d96 (diff) | |
| download | moa-sig-773535ab90950460f468d2edfc5be396f2776d25.tar.gz moa-sig-773535ab90950460f468d2edfc5be396f2776d25.tar.bz2 moa-sig-773535ab90950460f468d2edfc5be396f2776d25.zip | |
chore(core): refactor to Java 17 and Servlet-API 6.0
Diffstat (limited to 'moaSig/common')
| -rw-r--r-- | moaSig/common/build.gradle | 23 | ||||
| -rw-r--r-- | moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java | 1 |
2 files changed, 18 insertions, 6 deletions
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle index 6054eff..79f1b02 100644 --- a/moaSig/common/build.gradle +++ b/moaSig/common/build.gradle @@ -5,14 +5,25 @@ plugins { dependencies { implementation files('../libs/iaik_jce_full_signed-6.1_moa.jar') - api 'org.slf4j:slf4j-api:1.7.36' - api 'xerces:xercesImpl:2.12.2' - api 'xalan:xalan:2.7.1' - api 'xalan:serializer:2.7.1' - api 'joda-time:joda-time:2.12.7' - api 'jaxen:jaxen:1.2.0' + api 'org.slf4j:slf4j-api:2.0.17' + + api(group: 'xerces', name: 'xercesImpl', version: '2.12.2') { + exclude group: 'xml-apis', module: 'xml-apis' + } + + api(group: 'xalan', name: 'xalan', version: '2.7.1') { + exclude group: 'xml-apis', module: 'xml-apis' + } + + api(group: 'xalan', name: 'serializer', version: '2.7.1') { + exclude group: 'xml-apis', module: 'xml-apis' + } + + api 'joda-time:joda-time:2.14.0' + api 'jaxen:jaxen:2.0.0' } + java { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java index 2c9b4c0..a95ee5b 100644 --- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java +++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Base64Utils.java @@ -46,6 +46,7 @@ public class Base64Utils { * @param base64String The <code>String</code> containing the Base64 * encoded bytes. * @param ignoreInvalidChars Whether to ignore invalid Base64 characters. + * @param encoding Char encoding that should be used * @return byte[] The raw bytes contained in the <code>base64String</code>. * @throws IOException Failed to read the Base64 data. */ |