From 9fa12858032ad83c00bfecad3aaadece7c1cdc80 Mon Sep 17 00:00:00 2001 From: Juku Trump Date: Thu, 4 Apr 2024 16:52:58 +0300 Subject: [PATCH] SIVA-633 Update dependencies --- OSS_USED.md | 102 +++++++++--------- pom.xml | 25 +++-- siva-parent/pom.xml | 2 +- siva-parent/siva-webapp/pom.xml | 6 +- .../generic-validation-service/pom.xml | 4 +- .../pom.xml | 2 +- .../validation-commons/pom.xml | 2 +- 7 files changed, 68 insertions(+), 75 deletions(-) diff --git a/OSS_USED.md b/OSS_USED.md index 21def58a1..0c5b9aa59 100644 --- a/OSS_USED.md +++ b/OSS_USED.md @@ -9,57 +9,51 @@ Libraries license information was obtained using the following command: ./mvnw license:aggregate-add-third-party ``` -Lists of 52 third-party dependencies. - - (The Apache Software License, Version 2.0) co.elastic.logging:logback-ecs-encoder (co.elastic.logging:logback-ecs-encoder:1.5.0 - https://github.com/elastic/ecs-logging-java/logback-ecs-encoder) - (The Apache Software License, Version 2.0) jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.13.5 - http://github.com/FasterXML/jackson) - (Apache License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:31.1-jre - https://github.com/google/guava) - (BSD) jcabi-manifests (com.jcabi:jcabi-manifests:1.1 - http://www.jcabi.com/jcabi-manifests) - (Eclipse Distribution License - v 1.0) JAX-WS RI Standalone Zipped Bundle (com.sun.xml.ws:jaxws-ri:2.3.6 - https://projects.eclipse.org/projects/ee4j/jaxws-ri-bom/jaxws-ri-bom-ext/project/bundles/jaxws-ri) - (Apache License, Version 2.0) Apache Commons Codec (commons-codec:commons-codec:1.15 - https://commons.apache.org/proper/commons-codec/) - (Apache License, Version 2.0) Apache Commons IO (commons-io:commons-io:2.11.0 - https://commons.apache.org/proper/commons-io/) - (European Union Public License 1.1) Generic Validation Service (ee.openid.siva:generic-validation-service:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/generic-validation-service) - (European Union Public License 1.1) siva-monitoring (ee.openid.siva:siva-monitoring:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-monitoring) - (European Union Public License 1.1) SiVa signature service (ee.openid.siva:siva-signature-service:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-signature-service) - (European Union Public License 1.1) siva-statistics (ee.openid.siva:siva-statistics:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-statistics) - (European Union Public License 1.1) SiVa validation service proxy (ee.openid.siva:siva-validation-proxy:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-validation-proxy) - (European Union Public License 1.1) siva-webapp (ee.openid.siva:siva-webapp:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-webapp) - (European Union Public License 1.1) Time-mark container Validation Service (ee.openid.siva:timemark-container-validation-service:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/timemark-container-validation-service) - (European Union Public License 1.1) TimeStampToken Validation Service (ee.openid.siva:timestamptoken-validation-service:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/timestamptoken-validation-service) - (European Union Public License 1.1) tsl-loader (ee.openid.siva:tsl-loader:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/tsl-loader) - (European Union Public License 1.1) validation-commons (ee.openid.siva:validation-commons:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/validation-commons) - (CDDL + GPLv2 with classpath exception) JAX-WS API (javax.xml.ws:jaxws-api:2.3.1 - https://github.com/javaee/jax-ws-spec) - (Apache License, Version 2.0) Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/) - (Apache License, Version 2.0) Apache Commons Lang (org.apache.commons:commons-lang3:3.12.0 - https://commons.apache.org/proper/commons-lang/) - (Apache License, Version 2.0) Apache CXF Runtime JAX-WS Frontend (org.apache.cxf:cxf-rt-frontend-jaxws:3.5.5 - https://cxf.apache.org) - (Apache License, Version 2.0) Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:3.5.5 - https://cxf.apache.org) - (Apache License, Version 2.0) Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.27 - https://www.apache.org/pdfbox-parent/pdfbox/) - (Apache License, Version 2.0) Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.28 - https://www.apache.org/pdfbox-parent/pdfbox/) - (Apache License, Version 2.0) Apache XML Security for Java (org.apache.santuario:xmlsec:2.3.3 - https://santuario.apache.org/) - (Bouncy Castle Licence) Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk15on:1.70 - https://www.bouncycastle.org/java.html) - (Bouncy Castle Licence) Bouncy Castle Provider (org.bouncycastle:bcprov-jdk15on:1.70 - https://www.bouncycastle.org/java.html) - (GNU Lesser General Public License, Version 2.1) DigiDoc4j (org.digidoc4j:digidoc4j:5.2.0 - https://github.com/open-eid/digidoc4j) - (GNU Lesser General Public License) DSS ASiC Common (org.digidoc4j.dss:dss-asic-common:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-asic-common) - (GNU Lesser General Public License) DSS ASiC with XAdES signature(s) (org.digidoc4j.dss:dss-asic-xades:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-asic-xades) - (GNU Lesser General Public License) DSS CRL Parser with X509CRL object (org.digidoc4j.dss:dss-crl-parser-x509crl:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-crl-parser-x509crl) - (GNU Lesser General Public License) JAXB Detailed Report Data Model (org.digidoc4j.dss:dss-detailed-report-jaxb:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-detailed-report-jaxb) - (GNU Lesser General Public License) JAXB Diagnostic Data Model (org.digidoc4j.dss:dss-diagnostic-jaxb:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-diagnostic-jaxb) - (GNU Lesser General Public License) DSS Document (org.digidoc4j.dss:dss-document:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-document) - (GNU Lesser General Public License) DSS PAdES (org.digidoc4j.dss:dss-pades:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-pades) - (GNU Lesser General Public License) DSS PAdES using PDFBox (org.digidoc4j.dss:dss-pades-pdfbox:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-pades-pdfbox) - (GNU Lesser General Public License) DSS Service (org.digidoc4j.dss:dss-service:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-service) - (GNU Lesser General Public License) DSS Service Provider Interface (org.digidoc4j.dss:dss-spi:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-spi) - (GNU Lesser General Public License) DSS Token (org.digidoc4j.dss:dss-token:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-token) - (GNU Lesser General Public License) DSS TSL Validation (org.digidoc4j.dss:dss-tsl-validation:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-tsl-validation) - (GNU Lesser General Public License) DSS Utils implementation with Apache Commons (org.digidoc4j.dss:dss-utils-apache-commons:5.11.1.d4j.1 - https://github.com/open-eid/sd-dss/dss-utils-apache-commons) - (The Apache Software License, Version 2.0) JetBrains Java Annotations (org.jetbrains:annotations:24.0.1 - https://github.com/JetBrains/java-annotations) - (Public Domain) JSON in Java (org.json:json:20230227 - https://github.com/douglascrockford/JSON-java) - (The MIT License) mockito-inline (org.mockito:mockito-inline:4.5.1 - https://github.com/mockito/mockito) - (The MIT License) Project Lombok (org.projectlombok:lombok:1.18.26 - https://projectlombok.org) - (Apache License, Version 2.0) spring-boot-starter (org.springframework.boot:spring-boot-starter:2.7.11 - https://spring.io/projects/spring-boot) - (Apache License, Version 2.0) spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:2.7.11 - https://spring.io/projects/spring-boot) - (Apache License, Version 2.0) spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:2.7.11 - https://spring.io/projects/spring-boot) - (Apache License, Version 2.0) spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:2.7.11 - https://spring.io/projects/spring-boot) - (Apache License, Version 2.0) spring-boot-starter-validation (org.springframework.boot:spring-boot-starter-validation:2.7.11 - https://spring.io/projects/spring-boot) - (Apache License, Version 2.0) spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:2.7.11 - https://spring.io/projects/spring-boot) - (Apache License, Version 2.0) Spring Cloud Starter Sleuth with Brave (org.springframework.cloud:spring-cloud-starter-sleuth:3.1.7 - https://spring.io/spring-cloud/spring-cloud-sleuth/spring-cloud-starter-sleuth) \ No newline at end of file +Lists of 47 third-party dependencies. + (The Apache Software License, Version 2.0) co.elastic.logging:logback-ecs-encoder (co.elastic.logging:logback-ecs-encoder:1.6.0 - https://github.com/elastic/ecs-logging-java/logback-ecs-encoder) + (Apache License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:33.1.0-jre - https://github.com/google/guava) + (3-Clause BSD License) jcabi-manifests (com.jcabi:jcabi-manifests:2.1.0 - https://www.jcabi.com/jcabi-manifests) + (Eclipse Distribution License - v 1.0) JAX-WS RI Standalone Zipped Bundle (com.sun.xml.ws:jaxws-ri:4.0.2 - https://projects.eclipse.org/projects/ee4j/jaxws-ri-bom/jaxws-ri-bom-ext/project/bundles/jaxws-ri) + (Apache-2.0) Apache Commons Codec (commons-codec:commons-codec:1.16.1 - https://commons.apache.org/proper/commons-codec/) + (Apache-2.0) Apache Commons IO (commons-io:commons-io:2.16.0 - https://commons.apache.org/proper/commons-io/) + (European Union Public License 1.1) Generic Validation Service (ee.openid.siva:generic-validation-service:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/generic-validation-service) + (European Union Public License 1.1) siva-monitoring (ee.openid.siva:siva-monitoring:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-monitoring) + (European Union Public License 1.1) SiVa signature service (ee.openid.siva:siva-signature-service:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-signature-service) + (European Union Public License 1.1) siva-statistics (ee.openid.siva:siva-statistics:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-statistics) + (European Union Public License 1.1) SiVa validation service proxy (ee.openid.siva:siva-validation-proxy:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-validation-proxy) + (European Union Public License 1.1) siva-webapp (ee.openid.siva:siva-webapp:3.7.0 - https://github.com/open-eid/SiVa/siva-parent/siva-webapp) + (European Union Public License 1.1) Time-mark container Validation Service (ee.openid.siva:timemark-container-validation-service:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/timemark-container-validation-service) + (European Union Public License 1.1) TimeStampToken Validation Service (ee.openid.siva:timestamptoken-validation-service:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/timestamptoken-validation-service) + (European Union Public License 1.1) tsl-loader (ee.openid.siva:tsl-loader:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/tsl-loader) + (European Union Public License 1.1) validation-commons (ee.openid.siva:validation-commons:3.7.0 - https://github.com/open-eid/SiVa/validation-services-parent/validation-commons) + (Eclipse Distribution License - v 1.0) Jakarta XML Web Services API (jakarta.xml.ws:jakarta.xml.ws-api:4.0.1 - https://github.com/jakartaee/jax-ws-api) + (Apache-2.0) Apache CXF Runtime JAX-WS Frontend (org.apache.cxf:cxf-rt-frontend-jaxws:4.0.4 - https://cxf.apache.org) + (Apache-2.0) Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:4.0.4 - https://cxf.apache.org) + (Apache License, Version 2.0) Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.31 - https://www.apache.org/pdfbox-parent/pdfbox/) + (Bouncy Castle Licence) Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.76 - https://www.bouncycastle.org/java.html) + (Bouncy Castle Licence) Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.76 - https://www.bouncycastle.org/java.html) + (GNU Lesser General Public License, Version 2.1) DigiDoc4j (org.digidoc4j:digidoc4j:5.3.0 - https://github.com/open-eid/digidoc4j) + (GNU Lesser General Public License) DSS ASiC Common (org.digidoc4j.dss:dss-asic-common:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-asic-common) + (GNU Lesser General Public License) DSS ASiC with XAdES signature(s) (org.digidoc4j.dss:dss-asic-xades:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-asic-xades) + (GNU Lesser General Public License) DSS CRL Parser with X509CRL object (org.digidoc4j.dss:dss-crl-parser-x509crl:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-crl-parser-x509crl) + (GNU Lesser General Public License) JAXB Detailed Report Data Model (org.digidoc4j.dss:dss-detailed-report-jaxb:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-detailed-report-jaxb) + (GNU Lesser General Public License) JAXB Diagnostic Data Model (org.digidoc4j.dss:dss-diagnostic-jaxb:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-diagnostic-jaxb) + (GNU Lesser General Public License) DSS Document (org.digidoc4j.dss:dss-document:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-document) + (GNU Lesser General Public License) DSS PAdES (org.digidoc4j.dss:dss-pades:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-pades) + (GNU Lesser General Public License) DSS PAdES using PDFBox (org.digidoc4j.dss:dss-pades-pdfbox:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-pades-pdfbox) + (GNU Lesser General Public License) DSS Service (org.digidoc4j.dss:dss-service:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-service) + (GNU Lesser General Public License) DSS Service Provider Interface (org.digidoc4j.dss:dss-spi:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-spi) + (GNU Lesser General Public License) DSS Token (org.digidoc4j.dss:dss-token:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-token) + (GNU Lesser General Public License) DSS TSL Validation (org.digidoc4j.dss:dss-tsl-validation:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-tsl-validation) + (GNU Lesser General Public License) DSS Utils implementation with Apache Commons (org.digidoc4j.dss:dss-utils-apache-commons:6.0.d4j.1 - https://github.com/open-eid/sd-dss/dss-utils-apache-commons) + (The Apache Software License, Version 2.0) JetBrains Java Annotations (org.jetbrains:annotations:24.1.0 - https://github.com/JetBrains/java-annotations) + (Public Domain) JSON in Java (org.json:json:20240303 - https://github.com/douglascrockford/JSON-java) + (The MIT License) mockito-inline (org.mockito:mockito-inline:5.2.0 - https://github.com/mockito/mockito) + (The MIT License) Project Lombok (org.projectlombok:lombok:1.18.32 - https://projectlombok.org) + (Apache License, Version 2.0) spring-boot-starter (org.springframework.boot:spring-boot-starter:3.2.4 - https://spring.io/projects/spring-boot) + (Apache License, Version 2.0) spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:3.2.4 - https://spring.io/projects/spring-boot) + (Apache License, Version 2.0) spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:3.2.4 - https://spring.io/projects/spring-boot) + (Apache License, Version 2.0) spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:3.2.4 - https://spring.io/projects/spring-boot) + (Apache License, Version 2.0) spring-boot-starter-validation (org.springframework.boot:spring-boot-starter-validation:3.2.4 - https://spring.io/projects/spring-boot) + (Apache License, Version 2.0) spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:3.2.4 - https://spring.io/projects/spring-boot) + (Apache License, Version 2.0) Spring Cloud Starter Sleuth with Brave (org.springframework.cloud:spring-cloud-starter-sleuth:3.1.11 - https://spring.io/spring-cloud/spring-cloud-sleuth/spring-cloud-starter-sleuth) diff --git a/pom.xml b/pom.xml index e37c3070b..b545adcf1 100644 --- a/pom.xml +++ b/pom.xml @@ -116,15 +116,14 @@ 1.76 6.0.d4j.1 - 1.15 + 1.16.1 4.4 - 2.11.0 - 2.13.5 - 20230227 - 1.4.14 - 1.18.30 - 2.0 - 3.2.0 + 2.16.0 + 20240303 + 1.5.3 + 1.18.32 + 2.2 + 3.2.4 jacoco reuseReports @@ -147,7 +146,7 @@ maven-pmd-plugin - 3.20.0 + 3.21.2 @@ -165,7 +164,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 true ${language.level} @@ -184,7 +183,7 @@ org.jacoco jacoco-maven-plugin - 0.8.9 + 0.8.12 **/*Application.* @@ -208,12 +207,12 @@ org.apache.maven.plugins maven-release-plugin - 3.0.0-M5 + 3.0.1 org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.2.5 true ${argLine} -Dfile.encoding=UTF-8 -Xmx1024m diff --git a/siva-parent/pom.xml b/siva-parent/pom.xml index 7bb228552..e6184f088 100644 --- a/siva-parent/pom.xml +++ b/siva-parent/pom.xml @@ -38,7 +38,7 @@ - 4.0.3 + 4.0.4 diff --git a/siva-parent/siva-webapp/pom.xml b/siva-parent/siva-webapp/pom.xml index b3dc1c2e2..143f73590 100644 --- a/siva-parent/siva-webapp/pom.xml +++ b/siva-parent/siva-webapp/pom.xml @@ -97,13 +97,13 @@ org.springframework.cloud spring-cloud-starter-sleuth - 3.1.7 + 3.1.11 co.elastic.logging logback-ecs-encoder - 1.5.0 + 1.6.0 @@ -272,7 +272,7 @@ maven-war-plugin - 3.3.2 + 3.4.0 diff --git a/validation-services-parent/generic-validation-service/pom.xml b/validation-services-parent/generic-validation-service/pom.xml index 11687e4b3..94de5f03f 100644 --- a/validation-services-parent/generic-validation-service/pom.xml +++ b/validation-services-parent/generic-validation-service/pom.xml @@ -61,7 +61,7 @@ org.apache.pdfbox pdfbox - 2.0.27 + 2.0.31 org.digidoc4j.dss @@ -79,7 +79,7 @@ com.google.guava guava - 31.1-jre + 33.1.0-jre diff --git a/validation-services-parent/timemark-container-validation-service/pom.xml b/validation-services-parent/timemark-container-validation-service/pom.xml index 9208ef3cf..97e8d3869 100644 --- a/validation-services-parent/timemark-container-validation-service/pom.xml +++ b/validation-services-parent/timemark-container-validation-service/pom.xml @@ -51,7 +51,7 @@ org.apache.pdfbox pdfbox - 2.0.28 + 2.0.31 diff --git a/validation-services-parent/validation-commons/pom.xml b/validation-services-parent/validation-commons/pom.xml index 8ba2e728a..8ec5ee0f5 100644 --- a/validation-services-parent/validation-commons/pom.xml +++ b/validation-services-parent/validation-commons/pom.xml @@ -84,7 +84,7 @@ org.jetbrains annotations - 24.0.1 + 24.1.0