diff --git a/example/src/main/java/eu/webeid/example/security/WebEidAjaxLoginProcessingFilter.java b/example/src/main/java/eu/webeid/example/security/WebEidAjaxLoginProcessingFilter.java index 4782ee93..485dba10 100644 --- a/example/src/main/java/eu/webeid/example/security/WebEidAjaxLoginProcessingFilter.java +++ b/example/src/main/java/eu/webeid/example/security/WebEidAjaxLoginProcessingFilter.java @@ -22,8 +22,8 @@ package eu.webeid.example.security; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectReader; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectReader; import eu.webeid.example.security.ajax.AjaxAuthenticationFailureHandler; import eu.webeid.example.security.ajax.AjaxAuthenticationSuccessHandler; import eu.webeid.example.security.dto.AuthTokenDTO; diff --git a/example/src/main/java/eu/webeid/example/security/ajax/AjaxAuthenticationSuccessHandler.java b/example/src/main/java/eu/webeid/example/security/ajax/AjaxAuthenticationSuccessHandler.java index a5ea20d0..e8ccc08d 100644 --- a/example/src/main/java/eu/webeid/example/security/ajax/AjaxAuthenticationSuccessHandler.java +++ b/example/src/main/java/eu/webeid/example/security/ajax/AjaxAuthenticationSuccessHandler.java @@ -23,9 +23,9 @@ package eu.webeid.example.security.ajax; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; +import tools.jackson.core.JsonProcessingException; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectWriter; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; diff --git a/example/src/test/java/eu/webeid/example/testutil/ObjectMother.java b/example/src/test/java/eu/webeid/example/testutil/ObjectMother.java index 288b1368..3bd0556d 100644 --- a/example/src/test/java/eu/webeid/example/testutil/ObjectMother.java +++ b/example/src/test/java/eu/webeid/example/testutil/ObjectMother.java @@ -22,8 +22,8 @@ package eu.webeid.example.testutil; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.JsonProcessingException; +import tools.jackson.databind.ObjectMapper; import eu.webeid.example.service.dto.SignatureAlgorithmDTO; import eu.webeid.security.authtoken.WebEidAuthToken; import org.apache.commons.lang3.ArrayUtils; diff --git a/pom.xml b/pom.xml index 2816da7c..31e373bd 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 11 0.12.6 1.81 - 2.19.1 + 3.1.3 2.0.17 5.13.3 3.27.3 @@ -46,7 +46,7 @@ ${jjwt.version} - com.fasterxml.jackson.core + tools.jackson.core jackson-databind ${jackson.version} diff --git a/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java b/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java index 14cf3e78..bf360e8a 100644 --- a/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java +++ b/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java @@ -22,8 +22,9 @@ package eu.webeid.security.validator; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectReader; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectReader; import eu.webeid.security.authtoken.WebEidAuthToken; import eu.webeid.security.certificate.CertificateLoader; import eu.webeid.security.certificate.CertificateValidator; @@ -140,7 +141,7 @@ private WebEidAuthToken parseToken(String authToken) throws AuthTokenParseExcept throw new AuthTokenParseException("Web eID authentication token is null"); } return token; - } catch (IOException e) { + } catch (JacksonException e) { throw new AuthTokenParseException("Error parsing Web eID authentication token", e); } } diff --git a/src/test/java/eu/webeid/security/testutil/DateMocker.java b/src/test/java/eu/webeid/security/testutil/DateMocker.java index ec49a049..f0be8c84 100644 --- a/src/test/java/eu/webeid/security/testutil/DateMocker.java +++ b/src/test/java/eu/webeid/security/testutil/DateMocker.java @@ -22,7 +22,7 @@ package eu.webeid.security.testutil; -import com.fasterxml.jackson.databind.util.StdDateFormat; +import tools.jackson.databind.util.StdDateFormat; import eu.webeid.security.util.DateAndTime; import io.jsonwebtoken.Clock; import org.mockito.MockedStatic; diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java index 14ed0666..50779cd4 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java @@ -22,7 +22,7 @@ package eu.webeid.security.validator; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; +import tools.jackson.databind.exc.MismatchedInputException; import eu.webeid.security.authtoken.WebEidAuthToken; import eu.webeid.security.exceptions.AuthTokenException; import eu.webeid.security.exceptions.AuthTokenParseException; diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java index fc7edd0c..b4b84195 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java @@ -22,8 +22,8 @@ package eu.webeid.security.validator; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectReader; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectReader; import eu.webeid.security.certificate.CertificateLoader; import org.junit.jupiter.api.Test; import eu.webeid.security.authtoken.WebEidAuthToken;