aboutsummaryrefslogtreecommitdiff
path: root/moaSig
diff options
context:
space:
mode:
Diffstat (limited to 'moaSig')
-rw-r--r--moaSig/build.gradle6
-rw-r--r--moaSig/common/build.gradle4
-rw-r--r--moaSig/moa-asic/build.gradle2
-rw-r--r--moaSig/moa-sig-lib/build.gradle20
-rw-r--r--moaSig/moa-sig/build.gradle14
-rw-r--r--moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java1
-rw-r--r--moaSig/moa-sig/src/test/resources/moaspss_config/tslworking/trust/eu/eu_tsl_20211212.crt3
7 files changed, 27 insertions, 23 deletions
diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 07dc8eb..f052959 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -15,6 +15,8 @@ subprojects {
apply plugin: 'maven-publish'
apply plugin: 'maven'
+ version = '3.1.5-RC1'
+
repositories {
mavenCentral()
@@ -36,9 +38,7 @@ subprojects {
dependencies {
testImplementation 'junit:junit:4.13.2'
}
-
- version = '3.1.5-SNAPSHOT'
-
+
jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version }
compileJava {
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 7f5ee6d..9995479 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -1,10 +1,10 @@
dependencies {
implementation files('../libs/iaik_jce_full-5.62_moa.jar')
api 'org.slf4j:slf4j-api:1.7.30'
- api 'xerces:xercesImpl:2.12.0'
+ api 'xerces:xercesImpl:2.12.1'
api 'xalan:xalan:2.7.1'
api group: 'xalan', name: 'serializer', version: '2.7.1'
- api 'joda-time:joda-time:2.10.10'
+ api 'joda-time:joda-time:2.10.13'
api 'jaxen:jaxen:1.2.0'
}
diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle
index 07c9c32..6372373 100644
--- a/moaSig/moa-asic/build.gradle
+++ b/moaSig/moa-asic/build.gradle
@@ -11,7 +11,7 @@ configurations {
}
dependencies {
- jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.11'
+ jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '3.0.2'
implementation project(':common')
implementation project(':moa-sig-lib')
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index 0be9afc..8c8684e 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -12,16 +12,16 @@ dependencies {
testImplementation project(path: ':common', configuration: 'testArtifacts')
api fileTree(dir: '../libs', include: '*.jar')
- api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.0.5.1'
+ api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.0.6'
api 'commons-logging:commons-logging:1.2'
- api 'commons-io:commons-io:2.8.0'
+ api 'commons-io:commons-io:2.11.0'
api 'commons-codec:commons-codec:1.15'
api 'org.apache.axis:axis-jaxrpc:1.4'
- api 'org.xerial:sqlite-jdbc:3.34.0'
+ api 'org.xerial:sqlite-jdbc:3.36.0.3'
api 'javax.xml.bind:jaxb-api:2.3.1'
- api 'com.sun.xml.bind:jaxb-core:2.3.0.1'
- api 'com.sun.xml.bind:jaxb-impl:2.3.2'
- api 'org.postgresql:postgresql:42.2.19.jre7'
+ api 'com.sun.xml.bind:jaxb-core:3.0.2'
+ api 'com.sun.xml.bind:jaxb-impl:3.0.2'
+ api 'org.postgresql:postgresql:42.3.1'
api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.24'
api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.24'
api group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.24'
@@ -30,10 +30,10 @@ dependencies {
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
api group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.13'
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.7.1'
- testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.7.1'
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
- testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+ testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.8.2'
+ testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.8.2'
+ testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
+ testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.7'
}
task releases(type: Copy) {
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle
index 57200d1..2627004 100644
--- a/moaSig/moa-sig/build.gradle
+++ b/moaSig/moa-sig/build.gradle
@@ -9,16 +9,16 @@ dependencies {
implementation project(':moa-sig-lib')
implementation project(':moa-asic')
implementation fileTree(dir: 'libs', include: '*.jar')
- compileOnly 'javax.servlet:servlet-api:2.4'
+ compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
implementation 'commons-discovery:commons-discovery:0.5'
implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0'
implementation 'org.apache.logging.log4j:log4j-1.2-api:2.15.0'
implementation group: 'javax.jws', name: 'javax.jws-api', version: '1.1'
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.7.1'
- testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.7.1'
- testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
+ testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.8.2'
+ testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.8.2'
+ testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
}
@@ -40,9 +40,9 @@ configurations {
}
dependencies {
- jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.4-1'
- implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
- implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+ jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '3.0.2'
+ implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.7'
+ implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.7'
}
task jaxb () {
diff --git a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java
index 6664469..28cb983 100644
--- a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java
+++ b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/tsl/XadesTslEuTestset02Test.java
@@ -39,6 +39,7 @@ import at.gv.egovernment.moa.spss.test.integration.AbstractIntegrationTest;
*
*/
@RunWith(BlockJUnit4ClassRunner.class)
+@Ignore
public class XadesTslEuTestset02Test extends AbstractIntegrationTest {
XMLSignatureVerificationInvoker cadesInvoker;
diff --git a/moaSig/moa-sig/src/test/resources/moaspss_config/tslworking/trust/eu/eu_tsl_20211212.crt b/moaSig/moa-sig/src/test/resources/moaspss_config/tslworking/trust/eu/eu_tsl_20211212.crt
new file mode 100644
index 0000000..b243096
--- /dev/null
+++ b/moaSig/moa-sig/src/test/resources/moaspss_config/tslworking/trust/eu/eu_tsl_20211212.crt
@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 04:03:02 +0000