Merge branch 'RM-3731' into 'master'

RM-3731: Update Spring boot to 3.2.5 and 3rd party dependencies

See merge request cdoc2/cdoc2-java-ref-impl!45

Author: OlesjaAarma

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.4.0] Key label formatting (2024-XX-XX)
+
+### Internal
+
+* Upgraded Spring 3.2.5 -> 3.3.3 + other third-party dependency updates
+
 ## [1.3.0] '/key-capsules' OAS v2.1.0 support (2024-07-02)
 
 ### Features
@@ -9,7 +15,7 @@
   Label is not required, when CDOC2 file contains single password recipient.
 * Add example project to demonstrate usage of cdoc2-java-ref-impl with cdoc4j (convert cdoc -> cdoc2)
 
-## [1.2.0 ] Repository split and maintenance (2024-05-30)
+## [1.2.0] Repository split and maintenance (2024-05-30)
 
 ### Features
 

cdoc2-cli/pom.xml

@@ -32,12 +32,12 @@
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.7.5</version>
+            <version>4.7.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.13</version>
+            <version>2.0.16</version>
         </dependency>
         <dependency>
             <groupId>ee.cyber.cdoc2</groupId>

cdoc2-client/pom.xml

@@ -12,12 +12,12 @@
     <description>CDOC2 server client generation from openapi specification</description>
 
     <properties>
-        <logback-classic.version>1.4.14</logback-classic.version>
+        <logback-classic.version>1.5.7</logback-classic.version>
         <jersey.version>3.1.6</jersey.version>
-        <jackson.version>2.15.4</jackson.version>
+        <jackson.version>2.17.2</jackson.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
 
-        <spotbugs-annotations.version>4.8.5</spotbugs-annotations.version>
+        <spotbugs-annotations.version>4.8.3</spotbugs-annotations.version>
 
         <!--info.version from cdoc2-openapi/cdoc2-key-capsules-openapi.yaml -->
         <cdoc2-key-capsules-openapi.version>2.1.0</cdoc2-key-capsules-openapi.version>
@@ -120,7 +120,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.0</version>
                 <executions>
 
                     <!-- download openapi yaml using dependency::get -->
@@ -165,7 +165,7 @@
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>7.5.0</version>
+                <version>7.8.0</version>
                 <executions>
                     <execution>
                         <id>generate-key-capsules-api-client</id>

cdoc2-example-app/pom.xml

@@ -14,8 +14,8 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
-        <junit.jupiter.version>5.9.2</junit.jupiter.version>
+        <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
+        <junit.jupiter.version>5.10.3</junit.jupiter.version>
     </properties>
 
     <dependencyManagement>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.open-eid.cdoc4j</groupId>
             <artifactId>cdoc4j</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <exclusions>
                 <exclusion>
                     <!-- 2.11.0 from cdoc4j causes runtime MethodNotFound with cdoc2 commons-io 2.16.1 -->
@@ -74,7 +74,7 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.2.5</version>
+            <version>3.5.0</version>
             <configuration>
                 <trimStackTrace>false</trimStackTrace>
             </configuration>

cdoc2-lib/pom.xml

@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.passay</groupId>
             <artifactId>passay</artifactId>
-            <version>1.6.4</version>
+            <version>1.6.5</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
                 <!-- compile tests as a jar for use by sibling projects -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
                 <executions>
                     <execution>
                         <goals>

cdoc2-schema/pom.xml

@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>unpack</id>
@@ -143,7 +143,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

pom.xml

@@ -23,14 +23,14 @@
         <tests>!(pkcs11 | slow | ldap)</tests>
 
         <!-- versions of dependencies has to correspond with spring boot version-->
-        <!-- https://docs.spring.io/spring-boot/docs/current/reference/html/dependency-versions
-        .html-->
-        <junit-jupiter.version>5.10.2</junit-jupiter.version>
-        <logback-classic.version>1.5.6</logback-classic.version>
-        <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>
-        <maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
+        <!-- https://docs.spring.io/spring-boot/appendix/dependency-versions/coordinates.html-->
+        <junit-jupiter.version>5.10.3</junit-jupiter.version>
+        <logback-classic.version>1.5.7</logback-classic.version>
+        <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
+        <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
+        <maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
         <bouncycastle.version>1.78.1</bouncycastle.version>
-        <spring-boot.version>3.2.5</spring-boot.version>
+        <spring-boot.version>3.3.3</spring-boot.version>
         <spring.version>6.1.6</spring.version>
     </properties>
 
@@ -235,7 +235,7 @@
                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>${maven-checkstyle-plugin.version}</version>
 
                     <configuration>
                         <configLocation>checkstyle.xml</configLocation>
@@ -269,7 +269,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.5</version>
+                    <version>3.5.0</version>
                     <configuration>
                         <trimStackTrace>false</trimStackTrace>
                         <groups>${tests}</groups>
@@ -284,7 +284,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.1.1</version>
                     <configuration>
                         <tagNameFormat>v@{project.version}</tagNameFormat>
                     </configuration>
@@ -310,7 +310,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.8.4.0</version>
+                <version>4.8.6.2</version>
             </plugin>
 
             <plugin>
@@ -362,7 +362,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.3</version>
             </plugin>
 
         </plugins>