From 9f54331b61c967ab897061ccda5661a4e8808661 Mon Sep 17 00:00:00 2001
From: Maxim Grischenko <maksym.hryshchenko@adorsys.com>
Date: Tue, 3 Oct 2023 12:07:25 +0200
Subject: [PATCH 1/2] during release fixes

---
 .../impl/cmsencryption/CMSEncryptionServiceImpl.java         | 2 +-
 .../pathencryption/IntegrityPreservingUriEncryption.java     | 2 +-
 pom.xml                                                      | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java
index 4d8dc886d..abca2737d 100644
--- a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java
+++ b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/cmsencryption/CMSEncryptionServiceImpl.java
@@ -36,7 +36,7 @@
 /**
  * Cryptographic message syntax document encoder/decoder - see
  *
- * @see <a href=https://en.wikipedia.org/wiki/Cryptographic_Message_Syntax">CMS
+ * @see <a href="https://en.wikipedia.org/wiki/Cryptographic_Message_Syntax">CMS
  * wiki</a>
  */
 @Slf4j
diff --git a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java
index 928a358d7..f24d11f7f 100644
--- a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java
+++ b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java
@@ -24,7 +24,7 @@
  * It means that path/to/file is encrypted to cipher(path)/cipher(to)/cipher(file) and each invocation of example:
  * cipher(path) will yield same string, but cipher(path)/cipher(path) will not yield same segments -
  * it will be more like abc/cde and not like abc/abc.
- * Additionally each segment is authenticated against its parent path hash, so attacker can't
+ * Additionally, each segment is authenticated against its parent path hash, so attacker can't
  * move a/file to b/file without being detected.
  */
 @Slf4j
diff --git a/pom.xml b/pom.xml
index eb2583f13..9e8d51d92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -600,7 +600,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.1.0</version>
                         <configuration>
                             <keyname>opensource@adorsys.de</keyname>
                             <gpgArguments>
@@ -627,8 +627,9 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.6.0</version>
                         <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
+                            <additionalOptions>-Xdoclint:none</additionalOptions>
                         </configuration>
                         <executions>
                             <execution>

From ecd4c67b203ef6e4cca292c243d4f2ef06f38149 Mon Sep 17 00:00:00 2001
From: Maxim Grischenko <maksym.hryshchenko@adorsys.com>
Date: Fri, 6 Oct 2023 11:42:08 +0200
Subject: [PATCH 2/2] update plugin versions

---
 .../pom.xml                                   |  7 +----
 last-module-codecoverage-check/pom.xml        |  6 +++-
 pom.xml                                       | 29 ++++++++++++-------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml b/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml
index e65650ee9..7d8b7c7ee 100644
--- a/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml
+++ b/datasafe-long-run-tests/datasafe-business-tests-random-actions/pom.xml
@@ -11,10 +11,6 @@
 
     <artifactId>datasafe-business-tests-random-actions</artifactId>
 
-    <properties>
-        <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>de.adorsys</groupId>
@@ -185,9 +181,8 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.plugin.version}</version>
+                <version>${surefire.version}</version>
                 <configuration>
-                    <forkMode>once</forkMode>
                     <argLine>${testArgs}</argLine>
                 </configuration>
             </plugin>
diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml
index a45712d8f..fd80ffd30 100644
--- a/last-module-codecoverage-check/pom.xml
+++ b/last-module-codecoverage-check/pom.xml
@@ -11,6 +11,10 @@
 
     <artifactId>last-module-codecoverage-check</artifactId>
 
+    <properties>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>de.adorsys</groupId>
@@ -144,7 +148,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>${maven-resources-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/pom.xml b/pom.xml
index 9e8d51d92..f9ac6d80c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <jupiter.version>5.10.0</jupiter.version>
         <assertj.version>3.12.2</assertj.version>
         <mockito.version>5.5.0</mockito.version>
-        <surefire.version>2.22.1</surefire.version>
+        <surefire.version>3.1.2</surefire.version>
         <compress.version>1.21</compress.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <deploy.disabled>false</deploy.disabled>
@@ -122,6 +122,15 @@
         <keymanagement.version>0.0.9</keymanagement.version>
         <jakarta.annotation-api.varsion>2.1.1</jakarta.annotation-api.varsion>
         <jaxb-api.version>2.3.1</jaxb-api.version>
+        <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
+        <buildnumber-maven-plugin.version>1.3</buildnumber-maven-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
+        <maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
+        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -574,7 +583,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
+                        <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>sonatype</serverId>
@@ -587,7 +596,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>${maven-source-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -600,7 +609,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>${maven-gpg-plugin.version}</version>
                         <configuration>
                             <keyname>opensource@adorsys.de</keyname>
                             <gpgArguments>
@@ -627,7 +636,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.6.0</version>
+                        <version>${maven-javadoc-plugin.version}</version>
                         <configuration>
                             <additionalOptions>-Xdoclint:none</additionalOptions>
                         </configuration>
@@ -647,11 +656,11 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-project-info-reports-plugin</artifactId>
-                            <version>2.7</version>
+                            <version>${maven-project-info-reports-plugin.version}</version>
                         </plugin>
                         <plugin>
                             <artifactId>maven-release-plugin</artifactId>
-                            <version>2.5.2</version>
+                            <version>${maven-release-plugin.version}</version>
                             <configuration>
                                 <releaseProfiles>release</releaseProfiles>
                                 <autoVersionSubmodules>true</autoVersionSubmodules>
@@ -661,7 +670,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-jar-plugin</artifactId>
-                            <version>2.6</version>
+                            <version>${maven-jar-plugin.version}</version>
                             <configuration>
                                 <archive>
                                     <manifest>
@@ -684,7 +693,7 @@
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>buildnumber-maven-plugin</artifactId>
-                            <version>1.3</version>
+                            <version>${buildnumber-maven-plugin.version}</version>
                             <executions>
                                 <execution>
                                     <phase>validate</phase>
@@ -701,7 +710,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-deploy-plugin</artifactId>
-                            <version>2.8.1</version>
+                            <version>${maven-deploy-plugin.version}</version>
                             <configuration>
                                 <skip>${deploy.disabled}</skip>
                             </configuration>