Merge branch 'develop' into fix_javadoc

adorsys · Dec 13, 2023 · 54be98a · 54be98a
2 parents 495d803 + ab26791
commit 54be98a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/.../de/adorsys/datasafe/encrypiton/impl/pathencryption/IntegrityPreservingUriEncryption.java b/.../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/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>
@@ -186,9 +182,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
@@ -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
@@ -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,7 +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.2</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>
@@ -572,7 +580,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>
@@ -585,7 +593,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>
@@ -598,7 +606,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-gpg-plugin</artifactId>
- <version>3.0.1</version>
+ <version>${maven-gpg-plugin.version}</version>
  <configuration>
  <keyname>[email protected]</keyname>
  <gpgArguments>
@@ -625,8 +633,9 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
  <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalOptions>-Xdoclint:none</additionalOptions>
  </configuration>
  <executions>
  <execution>
@@ -644,11 +653,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>
@@ -658,7 +667,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>
@@ -681,7 +690,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>
@@ -698,7 +707,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>