diff options
| author | Thomas <> | 2022-04-05 09:14:17 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-04-05 09:14:17 +0200 |
| commit | 9d1e1294c2825c6f9a422c9f9c51f9965258d19e (patch) | |
| tree | 489c11343c4911cfda0a78974bdb51724c264f47 /pom.xml | |
| parent | ecc1dd834c5af467a5aa0f77e5dc6d986c6af418 (diff) | |
| parent | 791dc8acd7edbf22b98c2be111d420e61ebb39e6 (diff) | |
| download | National_eIDAS_Gateway-9d1e1294c2825c6f9a422c9f9c51f9965258d19e.tar.gz National_eIDAS_Gateway-9d1e1294c2825c6f9a422c9f9c51f9965258d19e.tar.bz2 National_eIDAS_Gateway-9d1e1294c2825c6f9a422c9f9c51f9965258d19e.zip | |
Merge branch 'master' into nightlybuild
# Conflicts:
# build_reporting/pom.xml
# connector/pom.xml
# infos/history.txt
# infos/readme_1.2.4.md
# modules/authmodule-eIDAS-v2/pom.xml
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
# modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java
# modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
# modules/core_common_lib/pom.xml
# modules/pom.xml
# pom.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -27,28 +27,29 @@ <spring-boot-starter-web.version>2.5.12</spring-boot-starter-web.version> <spring-boot-admin-starter-client.version>2.5.4</spring-boot-admin-starter-client.version> <org.springframework.version>5.3.18</org.springframework.version> - <org.thymeleaf-spring5.version>3.0.14.RELEASE</org.thymeleaf-spring5.version> + <org.thymeleaf-spring5.version>3.0.15.RELEASE</org.thymeleaf-spring5.version> <apache.cxf.version>3.5.0</apache.cxf.version> - + <eidas-ref.version>2.5.0</eidas-ref.version> <org.apache.commons-lang3.version>3.12.0</org.apache.commons-lang3.version> <org.apache.commons-text.version>1.9</org.apache.commons-text.version> <commons-collections4.version>4.4</commons-collections4.version> + <commons-io.version>2.11.0</commons-io.version> - <com.google.guava.version>31.0.1-jre</com.google.guava.version> - <joda-time.version>2.10.13</joda-time.version> + <com.google.guava.version>31.1-jre</com.google.guava.version> + <joda-time.version>2.10.14</joda-time.version> + <jackson-datatype-jsr310.version>2.13.2</jackson-datatype-jsr310.version> - <org.slf4j.version>1.7.32</org.slf4j.version> - <log4j.version>2.17.1</log4j.version> + <org.slf4j.version>1.7.36</org.slf4j.version> + <log4j.version>2.17.2</log4j.version> <ch.qos.logback.version>1.2.10</ch.qos.logback.version> - - <jackson-datatype-jsr310.version>2.13.1</jackson-datatype-jsr310.version> + <!-- org.xerial.sqlite-jdbc.version>3.34.0</org.xerial.sqlite-jdbc.version --> <javax.validation-api.version>2.0.1.Final</javax.validation-api.version> <hibernate-validator.version>6.1.5.Final</hibernate-validator.version> - <org.bitbucket.b_c.jose4j.version>0.7.9</org.bitbucket.b_c.jose4j.version> + <org.bitbucket.b_c.jose4j.version>0.7.11</org.bitbucket.b_c.jose4j.version> <!-- For software testing only --> @@ -365,6 +366,13 @@ <version>${jackson-datatype-jsr310.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-modules-java8</artifactId> + <version>${jackson-datatype-jsr310.version}</version> + <type>pom</type> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <version>${javax.validation-api.version}</version> |