Skip to content

Commit a419213

Browse files
Merge branch 'web-eid-mobile' into NFC-46
2 parents f14b326 + c8b70bb commit a419213

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

example/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
web-eid-springboot-example:
4-
image: web-eid-springboot-example:3.1.1
4+
image: web-eid-springboot-example:3.2.0
55
restart: always
66
environment:
77
JAVA_TOOL_OPTIONS: '-Dspring.profiles.active=prod'

example/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.4.4</version>
8+
<version>3.5.3</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>eu.webeid.example</groupId>
1212
<artifactId>web-eid-springboot-example</artifactId>
13-
<version>3.1.1</version>
13+
<version>3.2.0</version>
1414
<name>web-eid-springboot-example</name>
1515
<description>Example Spring Boot application that demonstrates how to use Web eID for authentication and digital
1616
signing
1717
</description>
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
22-
<webeid.version>3.1.1</webeid.version>
23-
<digidoc4j.version>6.0.0</digidoc4j.version>
24-
<jmockit.version>1.44</jmockit.version>
25-
<jib.version>3.4.5</jib.version>
21+
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
22+
<webeid.version>3.2.0</webeid.version>
23+
<digidoc4j.version>6.0.1</digidoc4j.version>
24+
<jmockit.version>1.44</jmockit.version> <!-- Keep version 1.44, otherwise mocking will fail. -->
25+
<jib.version>3.4.6</jib.version>
2626
</properties>
2727

2828
<dependencies>

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>authtoken-validation</artifactId>
77
<groupId>eu.webeid.security</groupId>
8-
<version>3.1.1</version>
8+
<version>3.2.0</version>
99
<packaging>jar</packaging>
1010
<name>authtoken-validation</name>
1111
<description>Web eID authentication token validation library for Java</description>
1212

1313
<properties>
1414
<java.version>11</java.version>
1515
<jjwt.version>0.12.6</jjwt.version>
16-
<bouncycastle.version>1.80</bouncycastle.version>
17-
<jackson.version>2.18.3</jackson.version>
16+
<bouncycastle.version>1.81</bouncycastle.version>
17+
<jackson.version>2.19.1</jackson.version>
1818
<slf4j.version>2.0.17</slf4j.version>
19-
<junit-jupiter.version>5.12.1</junit-jupiter.version>
19+
<junit-jupiter.version>5.13.3</junit-jupiter.version>
2020
<assertj.version>3.27.3</assertj.version>
21-
<mockito.version>5.17.0</mockito.version>
21+
<mockito.version>5.18.0</mockito.version>
2222
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
2323
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
2424
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
25-
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
25+
<maven-enforcer-plugin.version>3.6.0</maven-enforcer-plugin.version>
2626
<jacoco.version>0.8.12</jacoco.version>
2727
<sonar.coverage.jacoco.xmlReportPaths>
2828
${project.basedir}/../jacoco-coverage-report/target/site/jacoco-aggregate/jacoco.xml

src/test/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,11 @@ private SubjectCertificateNotRevokedValidator getSubjectCertificateNotRevokedVal
342342
return getSubjectCertificateNotRevokedValidator(getMockClient(response), getAiaOcspServiceProvider());
343343
}
344344

345-
private SubjectCertificateNotRevokedValidator getSubjectCertificateNotRevokedValidator(OcspServiceProvider ocspServiceProvider) throws JceException {
345+
private SubjectCertificateNotRevokedValidator getSubjectCertificateNotRevokedValidator(OcspServiceProvider ocspServiceProvider) {
346346
return getSubjectCertificateNotRevokedValidator(ocspClient, ocspServiceProvider);
347347
}
348348

349-
private SubjectCertificateNotRevokedValidator getSubjectCertificateNotRevokedValidator(OcspClient client, OcspServiceProvider ocspServiceProvider) throws JceException {
349+
private SubjectCertificateNotRevokedValidator getSubjectCertificateNotRevokedValidator(OcspClient client, OcspServiceProvider ocspServiceProvider) {
350350
return new SubjectCertificateNotRevokedValidator(trustedValidator, client, ocspServiceProvider, CONFIGURATION.getAllowedOcspResponseTimeSkew(), CONFIGURATION.getMaxOcspResponseThisUpdateAge());
351351
}
352352

@@ -357,6 +357,7 @@ private static void setSubjectCertificateIssuerCertificate(SubjectCertificateTru
357357
}
358358

359359
private HttpResponse<byte[]> getMockedResponse(byte[] bodyContent) throws URISyntaxException {
360+
@SuppressWarnings("unchecked")
360361
final HttpResponse<byte[]> mockResponse = mock(HttpResponse.class);
361362

362363
final HttpHeaders headers = HttpHeaders.of(

0 commit comments

Comments
 (0)