SIVA-633 Update dependencies

open-eid · Apr 4, 2024 · 9fa1285 · 9fa1285
1 parent b6a09e7
commit 9fa1285
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 75 deletions.
diff --git 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)
+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
@@ -116,15 +116,14 @@
 
         <bouncycastle.version>1.76</bouncycastle.version>
         <dss.version>6.0.d4j.1</dss.version>
-        <commons.codec.version>1.15</commons.codec.version>
+        <commons.codec.version>1.16.1</commons.codec.version>
         <commons.collections.version>4.4</commons.collections.version>
-        <commons.io.version>2.11.0</commons.io.version>
-        <jackson.version>2.13.5</jackson.version>
-        <json.version>20230227</json.version>
-        <logback.version>1.4.14</logback.version>
-        <lombok.version>1.18.30</lombok.version>
-        <snakeyaml.version>2.0</snakeyaml.version>
-        <spring.boot.version>3.2.0</spring.boot.version>
+        <commons.io.version>2.16.0</commons.io.version>
+        <json.version>20240303</json.version>
+        <logback.version>1.5.3</logback.version>
+        <lombok.version>1.18.32</lombok.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
+        <spring.boot.version>3.2.4</spring.boot.version>
 
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -147,7 +146,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.20.0</version>
+                <version>3.21.2</version>
             </plugin>
         </plugins>
     </reporting>
@@ -165,7 +164,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <source>${language.level}</source>
@@ -184,7 +183,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.9</version>
+                <version>0.8.12</version>
                 <configuration>
                     <excludes>
                         <exclude>**/*Application.*</exclude>
@@ -208,12 +207,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>3.0.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>3.2.5</version>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <argLine>${argLine} -Dfile.encoding=UTF-8 -Xmx1024m</argLine>

diff --git a/siva-parent/pom.xml b/siva-parent/pom.xml
@@ -38,7 +38,7 @@
     </modules>
 
     <properties>
-        <cxf.version>4.0.3</cxf.version>
+        <cxf.version>4.0.4</cxf.version>
     </properties>
 
     <dependencyManagement>

diff --git a/siva-parent/siva-webapp/pom.xml b/siva-parent/siva-webapp/pom.xml
@@ -97,13 +97,13 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
-            <version>3.1.7</version>
+            <version>3.1.11</version>
         </dependency>
 
         <dependency>
             <groupId>co.elastic.logging</groupId>
             <artifactId>logback-ecs-encoder</artifactId>
-            <version>1.5.0</version>
+            <version>1.6.0</version>
         </dependency>
 
         <dependency>
@@ -272,7 +272,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>3.3.2</version>
+                        <version>3.4.0</version>
                         <configuration>
                             <archive>
                                 <manifestEntries>