Skip to content

Commit 98ea6ba

Browse files
committed
RM-3731: Update Spring boot to 3.2.5 and 3rd party dependencies
1 parent ab619f8 commit 98ea6ba

File tree

7 files changed

+34
-28
lines changed

7 files changed

+34
-28
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## [1.4.0] Key label formatting (2024-XX-XX)
4+
5+
### Internal
6+
7+
* Upgraded Spring 3.2.5 -> 3.3.3 + other third-party dependency updates
8+
39
## [1.3.0] '/key-capsules' OAS v2.1.0 support (2024-07-02)
410

511
### Features
@@ -9,7 +15,7 @@
915
Label is not required, when CDOC2 file contains single password recipient.
1016
* Add example project to demonstrate usage of cdoc2-java-ref-impl with cdoc4j (convert cdoc -> cdoc2)
1117

12-
## [1.2.0 ] Repository split and maintenance (2024-05-30)
18+
## [1.2.0] Repository split and maintenance (2024-05-30)
1319

1420
### Features
1521

cdoc2-cli/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<dependency>
3333
<groupId>info.picocli</groupId>
3434
<artifactId>picocli</artifactId>
35-
<version>4.7.5</version>
35+
<version>4.7.6</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.slf4j</groupId>
3939
<artifactId>slf4j-simple</artifactId>
40-
<version>2.0.13</version>
40+
<version>2.0.16</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>ee.cyber.cdoc2</groupId>

cdoc2-client/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<description>CDOC2 server client generation from openapi specification</description>
1313

1414
<properties>
15-
<logback-classic.version>1.4.14</logback-classic.version>
15+
<logback-classic.version>1.5.7</logback-classic.version>
1616
<jersey.version>3.1.6</jersey.version>
17-
<jackson.version>2.15.4</jackson.version>
17+
<jackson.version>2.17.2</jackson.version>
1818
<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
1919

20-
<spotbugs-annotations.version>4.8.5</spotbugs-annotations.version>
20+
<spotbugs-annotations.version>4.8.3</spotbugs-annotations.version>
2121

2222
<!--info.version from cdoc2-openapi/cdoc2-key-capsules-openapi.yaml -->
2323
<cdoc2-key-capsules-openapi.version>2.1.0</cdoc2-key-capsules-openapi.version>
@@ -120,7 +120,7 @@
120120
<plugins>
121121
<plugin>
122122
<artifactId>maven-dependency-plugin</artifactId>
123-
<version>3.6.1</version>
123+
<version>3.8.0</version>
124124
<executions>
125125

126126
<!-- download openapi yaml using dependency::get -->
@@ -165,7 +165,7 @@
165165
<plugin>
166166
<groupId>org.openapitools</groupId>
167167
<artifactId>openapi-generator-maven-plugin</artifactId>
168-
<version>7.5.0</version>
168+
<version>7.8.0</version>
169169
<executions>
170170
<execution>
171171
<id>generate-key-capsules-api-client</id>

cdoc2-example-app/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<maven.compiler.target>17</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616

17-
<maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
18-
<junit.jupiter.version>5.9.2</junit.jupiter.version>
17+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
18+
<junit.jupiter.version>5.10.3</junit.jupiter.version>
1919
</properties>
2020

2121
<dependencyManagement>
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>org.open-eid.cdoc4j</groupId>
4242
<artifactId>cdoc4j</artifactId>
43-
<version>1.4</version>
43+
<version>1.5</version>
4444
<exclusions>
4545
<exclusion>
4646
<!-- 2.11.0 from cdoc4j causes runtime MethodNotFound with cdoc2 commons-io 2.16.1 -->
@@ -74,7 +74,7 @@
7474
<plugin>
7575
<groupId>org.apache.maven.plugins</groupId>
7676
<artifactId>maven-surefire-plugin</artifactId>
77-
<version>3.2.5</version>
77+
<version>3.5.0</version>
7878
<configuration>
7979
<trimStackTrace>false</trimStackTrace>
8080
</configuration>

cdoc2-lib/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.passay</groupId>
5858
<artifactId>passay</artifactId>
59-
<version>1.6.4</version>
59+
<version>1.6.5</version>
6060
</dependency>
6161

6262
<dependency>
@@ -85,7 +85,7 @@
8585
<!-- compile tests as a jar for use by sibling projects -->
8686
<groupId>org.apache.maven.plugins</groupId>
8787
<artifactId>maven-jar-plugin</artifactId>
88-
<version>3.4.1</version>
88+
<version>3.4.2</version>
8989
<executions>
9090
<execution>
9191
<goals>

cdoc2-schema/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-dependency-plugin</artifactId>
95-
<version>3.6.1</version>
95+
<version>3.8.0</version>
9696
<executions>
9797
<execution>
9898
<id>unpack</id>
@@ -143,7 +143,7 @@
143143
<plugin>
144144
<groupId>org.codehaus.mojo</groupId>
145145
<artifactId>build-helper-maven-plugin</artifactId>
146-
<version>3.5.0</version>
146+
<version>3.6.0</version>
147147
<executions>
148148
<execution>
149149
<id>add-source</id>

pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<tests>!(pkcs11 | slow | ldap)</tests>
2424

2525
<!-- versions of dependencies has to correspond with spring boot version-->
26-
<!-- https://docs.spring.io/spring-boot/docs/current/reference/html/dependency-versions
27-
.html-->
28-
<junit-jupiter.version>5.10.2</junit-jupiter.version>
29-
<logback-classic.version>1.5.6</logback-classic.version>
30-
<exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
31-
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
26+
<!-- https://docs.spring.io/spring-boot/appendix/dependency-versions/coordinates.html-->
27+
<junit-jupiter.version>5.10.3</junit-jupiter.version>
28+
<logback-classic.version>1.5.7</logback-classic.version>
29+
<exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
30+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
31+
<maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
3232
<bouncycastle.version>1.78.1</bouncycastle.version>
33-
<spring-boot.version>3.2.5</spring-boot.version>
33+
<spring-boot.version>3.3.3</spring-boot.version>
3434
<spring.version>6.1.6</spring.version>
3535
</properties>
3636

@@ -235,7 +235,7 @@
235235
<plugin>
236236
<groupId>org.apache.maven.plugins</groupId>
237237
<artifactId>maven-checkstyle-plugin</artifactId>
238-
<version>3.3.1</version>
238+
<version>${maven-checkstyle-plugin.version}</version>
239239

240240
<configuration>
241241
<configLocation>checkstyle.xml</configLocation>
@@ -269,7 +269,7 @@
269269
<plugin>
270270
<groupId>org.apache.maven.plugins</groupId>
271271
<artifactId>maven-surefire-plugin</artifactId>
272-
<version>3.2.5</version>
272+
<version>3.5.0</version>
273273
<configuration>
274274
<trimStackTrace>false</trimStackTrace>
275275
<groups>${tests}</groups>
@@ -284,7 +284,7 @@
284284
<plugin>
285285
<groupId>org.apache.maven.plugins</groupId>
286286
<artifactId>maven-release-plugin</artifactId>
287-
<version>3.0.1</version>
287+
<version>3.1.1</version>
288288
<configuration>
289289
<tagNameFormat>v@{project.version}</tagNameFormat>
290290
</configuration>
@@ -310,7 +310,7 @@
310310
<plugin>
311311
<groupId>com.github.spotbugs</groupId>
312312
<artifactId>spotbugs-maven-plugin</artifactId>
313-
<version>4.8.4.0</version>
313+
<version>4.8.6.2</version>
314314
</plugin>
315315

316316
<plugin>
@@ -362,7 +362,7 @@
362362
<plugin>
363363
<groupId>org.apache.maven.plugins</groupId>
364364
<artifactId>maven-deploy-plugin</artifactId>
365-
<version>3.1.1</version>
365+
<version>3.1.3</version>
366366
</plugin>
367367

368368
</plugins>

0 commit comments

Comments
 (0)