Skip to content

Commit 9acd6aa

Browse files
jukutrjukutr
committed
SIVA-763 Update dependencies; use default version of Paketo Buildpacks; fix Maven warnings
1 parent 168e639 commit 9acd6aa

File tree

14 files changed

+59
-165
lines changed

14 files changed

+59
-165
lines changed

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip

‎OSS_USED.md

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Libraries license information was obtained using the following command:
99
./mvnw license:aggregate-add-third-party
1010
```
1111

12-
Lists of 49 third-party dependencies.
12+
Lists of 46 third-party dependencies.
1313
(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)
14-
(Apache License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:33.1.0-jre - https://github.com/google/guava)
14+
(Apache License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:33.3.1-jre - https://github.com/google/guava)
1515
(3-Clause BSD License) jcabi-manifests (com.jcabi:jcabi-manifests:2.1.0 - https://www.jcabi.com/jcabi-manifests)
16-
(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)
17-
(Apache-2.0) Apache Commons Codec (commons-codec:commons-codec:1.16.1 - https://commons.apache.org/proper/commons-codec/)
18-
(Apache-2.0) Apache Commons IO (commons-io:commons-io:2.16.1 - https://commons.apache.org/proper/commons-io/)
16+
(Eclipse Distribution License - v 1.0) JAX-WS RI Standalone Zipped Bundle (com.sun.xml.ws:jaxws-ri:4.0.3 - https://projects.eclipse.org/projects/ee4j/jaxws-ri-bom/jaxws-ri-bom-ext/project/bundles/jaxws-ri)
17+
(Apache-2.0) Apache Commons Codec (commons-codec:commons-codec:1.17.1 - https://commons.apache.org/proper/commons-codec/)
18+
(Apache-2.0) Apache Commons IO (commons-io:commons-io:2.18.0 - https://commons.apache.org/proper/commons-io/)
1919
(European Union Public License 1.1) Generic Validation Service (ee.openid.siva:generic-validation-service:3.8.1 - https://github.com/open-eid/SiVa/validation-services-parent/generic-validation-service)
2020
(European Union Public License 1.1) siva-monitoring (ee.openid.siva:siva-monitoring:3.8.1 - https://github.com/open-eid/SiVa/siva-parent/siva-monitoring)
2121
(European Union Public License 1.1) SiVa signature service (ee.openid.siva:siva-signature-service:3.8.1 - https://github.com/open-eid/SiVa/siva-parent/siva-signature-service)
@@ -26,36 +26,33 @@ Lists of 49 third-party dependencies.
2626
(European Union Public License 1.1) TimeStampToken Validation Service (ee.openid.siva:timestamptoken-validation-service:3.8.1 - https://github.com/open-eid/SiVa/validation-services-parent/timestamptoken-validation-service)
2727
(European Union Public License 1.1) tsl-loader (ee.openid.siva:tsl-loader:3.8.1 - https://github.com/open-eid/SiVa/validation-services-parent/tsl-loader)
2828
(European Union Public License 1.1) validation-commons (ee.openid.siva:validation-commons:3.8.1 - https://github.com/open-eid/SiVa/validation-services-parent/validation-commons)
29-
(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)
3029
(Apache License, Version 2.0) Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/)
31-
(Apache-2.0) Apache Commons Lang (org.apache.commons:commons-lang3:3.14.0 - https://commons.apache.org/proper/commons-lang/)
32-
(Apache-2.0) Apache CXF Runtime JAX-WS Frontend (org.apache.cxf:cxf-rt-frontend-jaxws:4.0.4 - https://cxf.apache.org)
33-
(Apache-2.0) Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:4.0.4 - https://cxf.apache.org)
34-
(Apache License, Version 2.0) Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.31 - https://www.apache.org/pdfbox-parent/pdfbox/)
35-
(Bouncy Castle Licence) Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html)
36-
(Bouncy Castle Licence) Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html)
37-
(Bouncy Castle Licence) Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html)
38-
(GNU Lesser General Public License, Version 2.1) DigiDoc4j (org.digidoc4j:digidoc4j:5.4.0 - https://github.com/open-eid/digidoc4j)
39-
(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)
40-
(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)
41-
(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)
42-
(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)
43-
(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)
44-
(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)
45-
(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)
46-
(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)
47-
(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)
48-
(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)
49-
(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)
50-
(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)
51-
(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)
52-
(The Apache Software License, Version 2.0) JetBrains Java Annotations (org.jetbrains:annotations:24.1.0 - https://github.com/JetBrains/java-annotations)
30+
(Apache-2.0) Apache Commons Lang (org.apache.commons:commons-lang3:3.17.0 - https://commons.apache.org/proper/commons-lang/)
31+
(Apache License, Version 2.0) Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.32 - https://www.apache.org/pdfbox-parent/pdfbox/)
32+
(Bouncy Castle Licence) Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.79 - https://www.bouncycastle.org/java.html)
33+
(Bouncy Castle Licence) Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.79 - https://www.bouncycastle.org/java.html)
34+
(Bouncy Castle Licence) Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.79 - https://www.bouncycastle.org/java.html)
35+
(GNU Lesser General Public License, Version 2.1) DigiDoc4j (org.digidoc4j:digidoc4j:6.0.0-RC.1 - https://github.com/open-eid/digidoc4j)
36+
(GNU Lesser General Public License) DSS ASiC with CAdES signature(s) (org.digidoc4j.dss:dss-asic-cades:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-asic-cades)
37+
(GNU Lesser General Public License) DSS ASiC Common (org.digidoc4j.dss:dss-asic-common:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-asic-common)
38+
(GNU Lesser General Public License) DSS ASiC with XAdES signature(s) (org.digidoc4j.dss:dss-asic-xades:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-asic-xades)
39+
(GNU Lesser General Public License) DSS CRL Parser with X509CRL object (org.digidoc4j.dss:dss-crl-parser-x509crl:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-crl-parser-x509crl)
40+
(GNU Lesser General Public License) JAXB Detailed Report Data Model (org.digidoc4j.dss:dss-detailed-report-jaxb:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-detailed-report-jaxb)
41+
(GNU Lesser General Public License) JAXB Diagnostic Data Model (org.digidoc4j.dss:dss-diagnostic-jaxb:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-diagnostic-jaxb)
42+
(GNU Lesser General Public License) DSS Document (org.digidoc4j.dss:dss-document:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-document)
43+
(GNU Lesser General Public License) DSS PAdES (org.digidoc4j.dss:dss-pades:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-pades)
44+
(GNU Lesser General Public License) DSS PAdES using PDFBox (org.digidoc4j.dss:dss-pades-pdfbox:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-pades-pdfbox)
45+
(GNU Lesser General Public License) DSS Service (org.digidoc4j.dss:dss-service:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-service)
46+
(GNU Lesser General Public License) DSS Service Provider Interface (org.digidoc4j.dss:dss-spi:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-spi)
47+
(GNU Lesser General Public License) DSS Token (org.digidoc4j.dss:dss-token:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-token)
48+
(GNU Lesser General Public License) DSS TSL Validation (org.digidoc4j.dss:dss-tsl-validation:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-tsl-validation)
49+
(GNU Lesser General Public License) DSS Utils implementation with Apache Commons (org.digidoc4j.dss:dss-utils-apache-commons:6.0.d4j.2 - https://github.com/open-eid/sd-dss/dss-utils-apache-commons)
50+
(The Apache Software License, Version 2.0) JetBrains Java Annotations (org.jetbrains:annotations:26.0.1 - https://github.com/JetBrains/java-annotations)
5351
(Public Domain) JSON in Java (org.json:json:20240303 - https://github.com/douglascrockford/JSON-java)
54-
(The MIT License) mockito-inline (org.mockito:mockito-inline:5.2.0 - https://github.com/mockito/mockito)
55-
(The MIT License) Project Lombok (org.projectlombok:lombok:1.18.32 - https://projectlombok.org)
56-
(Apache License, Version 2.0) spring-boot-starter (org.springframework.boot:spring-boot-starter:3.2.5 - https://spring.io/projects/spring-boot)
57-
(Apache License, Version 2.0) spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:3.2.5 - https://spring.io/projects/spring-boot)
58-
(Apache License, Version 2.0) spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:3.2.5 - https://spring.io/projects/spring-boot)
59-
(Apache License, Version 2.0) spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:3.2.5 - https://spring.io/projects/spring-boot)
60-
(Apache License, Version 2.0) spring-boot-starter-validation (org.springframework.boot:spring-boot-starter-validation:3.2.5 - https://spring.io/projects/spring-boot)
61-
(Apache License, Version 2.0) spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:3.2.5 - https://spring.io/projects/spring-boot)
52+
(The MIT License) Project Lombok (org.projectlombok:lombok:1.18.36 - https://projectlombok.org)
53+
(Apache License, Version 2.0) spring-boot-starter (org.springframework.boot:spring-boot-starter:3.4.0 - https://spring.io/projects/spring-boot)
54+
(Apache License, Version 2.0) spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:3.4.0 - https://spring.io/projects/spring-boot)
55+
(Apache License, Version 2.0) spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:3.4.0 - https://spring.io/projects/spring-boot)
56+
(Apache License, Version 2.0) spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:3.4.0 - https://spring.io/projects/spring-boot)
57+
(Apache License, Version 2.0) spring-boot-starter-validation (org.springframework.boot:spring-boot-starter-validation:3.4.0 - https://spring.io/projects/spring-boot)
58+
(Apache License, Version 2.0) spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:3.4.0 - https://spring.io/projects/spring-boot)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Run following command:
4545
After that, you can optionally create an image for Docker:
4646

4747
```bash
48-
./mvnw spring-boot:build-image -pl siva-parent/siva-webapp
48+
./mvnw spring-boot:build-image -pl siva-parent/siva-webapp -DskipTests
4949
```
5050

5151
## How-to run

‎docker-compose.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ services:
1919
- "8080:8080"
2020
environment:
2121
- logging.config=/etc/siva-webapp/logback.xml
22+
# Logs directory
23+
- BUILD_FOLDER=/tmp/logs
24+
- DSS_DATA_FOLDER=/tmp/dss-data
2225
networks:
2326
default:
2427
aliases:

‎pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,12 @@
114114

115115
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
116116

117-
<bouncycastle.version>1.78.1</bouncycastle.version>
118-
<dss.version>6.0.d4j.1</dss.version>
119-
<commons.codec.version>1.16.1</commons.codec.version>
117+
<bouncycastle.version>1.79</bouncycastle.version>
118+
<dss.version>6.0.d4j.2</dss.version>
120119
<commons.collections.version>4.4</commons.collections.version>
121-
<commons.io.version>2.16.1</commons.io.version>
120+
<commons.io.version>2.18.0</commons.io.version>
122121
<json.version>20240303</json.version>
123-
<logback.version>1.5.6</logback.version>
124-
<lombok.version>1.18.32</lombok.version>
125-
<snakeyaml.version>2.2</snakeyaml.version>
126-
<spring.boot.version>3.2.5</spring.boot.version>
122+
<spring.boot.version>3.4.0</spring.boot.version>
127123

128124
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
129125
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -146,7 +142,7 @@
146142
</plugin>
147143
<plugin>
148144
<artifactId>maven-pmd-plugin</artifactId>
149-
<version>3.22.0</version>
145+
<version>3.26.0</version>
150146
</plugin>
151147
</plugins>
152148
</reporting>
@@ -156,7 +152,7 @@
156152
<plugin>
157153
<groupId>org.codehaus.mojo</groupId>
158154
<artifactId>license-maven-plugin</artifactId>
159-
<version>2.4.0</version>
155+
<version>2.5.0</version>
160156
<configuration>
161157
<includeTransitiveDependencies>false</includeTransitiveDependencies>
162158
</configuration>
@@ -166,7 +162,7 @@
166162
<artifactId>maven-compiler-plugin</artifactId>
167163
<version>3.13.0</version>
168164
<configuration>
169-
<forceJavacCompilerUse>true</forceJavacCompilerUse>
165+
<forceLegacyJavacApi>true</forceLegacyJavacApi>
170166
<source>${language.level}</source>
171167
<target>${language.level}</target>
172168
</configuration>
@@ -206,12 +202,12 @@
206202
<plugin>
207203
<groupId>org.apache.maven.plugins</groupId>
208204
<artifactId>maven-release-plugin</artifactId>
209-
<version>3.0.1</version>
205+
<version>3.1.1</version>
210206
</plugin>
211207
<plugin>
212208
<groupId>org.apache.maven.plugins</groupId>
213209
<artifactId>maven-surefire-plugin</artifactId>
214-
<version>3.2.5</version>
210+
<version>3.5.2</version>
215211
<configuration>
216212
<redirectTestOutputToFile>true</redirectTestOutputToFile>
217213
<argLine>${argLine} -Dfile.encoding=UTF-8 -Xmx1024m</argLine>
@@ -220,6 +216,7 @@
220216
<plugin>
221217
<groupId>org.apache.maven.plugins</groupId>
222218
<artifactId>maven-enforcer-plugin</artifactId>
219+
<version>3.5.0</version>
223220
<executions>
224221
<execution>
225222
<goals>

‎siva-parent/pom.xml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -155,49 +155,18 @@
155155
</exclusions>
156156
</dependency>
157157

158-
<dependency>
159-
<groupId>org.yaml</groupId>
160-
<artifactId>snakeyaml</artifactId>
161-
<version>${snakeyaml.version}</version>
162-
</dependency>
163-
164158
<!-- Public Dependencies -->
165159
<dependency>
166160
<groupId>commons-io</groupId>
167161
<artifactId>commons-io</artifactId>
168162
<version>${commons.io.version}</version>
169163
</dependency>
170164

171-
<!-- Apache commons -->
172-
<dependency>
173-
<groupId>commons-codec</groupId>
174-
<artifactId>commons-codec</artifactId>
175-
<version>${commons.codec.version}</version>
176-
</dependency>
177-
178-
<!-- Lombok for getters and setters -->
179-
<dependency>
180-
<groupId>org.projectlombok</groupId>
181-
<artifactId>lombok</artifactId>
182-
<version>${lombok.version}</version>
183-
</dependency>
184-
185165
<dependency>
186166
<groupId>org.json</groupId>
187167
<artifactId>json</artifactId>
188168
<version>${json.version}</version>
189169
</dependency>
190-
191-
<dependency>
192-
<groupId>ch.qos.logback</groupId>
193-
<artifactId>logback-classic</artifactId>
194-
<version>${logback.version}</version>
195-
</dependency>
196-
<dependency>
197-
<groupId>ch.qos.logback</groupId>
198-
<artifactId>logback-core</artifactId>
199-
<version>${logback.version}</version>
200-
</dependency>
201170
</dependencies>
202171
</dependencyManagement>
203172

‎siva-parent/siva-signature-service/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@
6868
<groupId>commons-io</groupId>
6969
<artifactId>commons-io</artifactId>
7070
</dependency>
71-
<dependency>
72-
<groupId>org.mockito</groupId>
73-
<artifactId>mockito-inline</artifactId>
74-
<version>5.2.0</version>
75-
<scope>test</scope>
76-
</dependency>
7771
</dependencies>
7872

7973
</project>

‎siva-parent/siva-statistics/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@
6060
</exclusion>
6161
</exclusions>
6262
</dependency>
63-
<dependency>
64-
<groupId>org.mockito</groupId>
65-
<artifactId>mockito-inline</artifactId>
66-
<version>5.2.0</version>
67-
<scope>test</scope>
68-
</dependency>
6963
</dependencies>
7064

7165
</project>

‎siva-parent/siva-validation-proxy/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@
8484
</exclusion>
8585
</exclusions>
8686
</dependency>
87-
<dependency>
88-
<groupId>org.mockito</groupId>
89-
<artifactId>mockito-inline</artifactId>
90-
<version>5.2.0</version>
91-
<scope>test</scope>
92-
</dependency>
9387

9488
</dependencies>
9589

0 commit comments

Comments
 (0)