Merge hotfix/5.11.6

.github/workflows/release.yml

@@ -12,9 +12,9 @@ on:
 env:
   GH_USER_NAME: github.actor
   SCRIPTS_VERSION: 5.11.0
-  BOM_VERSION: 5.11.1
+  BOM_VERSION: 5.11.7
   MIGRATIONS_VERSION: 5.11.0
-  RELEASE_VERSION: 5.11.5
+  RELEASE_VERSION: 5.11.6
 
 jobs:
   release:

build.gradle

@@ -26,7 +26,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.10.0' : 'com.epam.reportportal:commons-bom:5.10.0')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.11.7' : 'com.epam.reportportal:commons-bom:5.11.7')
         mavenBom('io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0')
     }
 }
@@ -57,7 +57,7 @@ dependencies {
 
     compile 'io.minio:minio:6.0.13'
 
-    implementation group: 'org.json', name: 'json', version: '20220320'
+    implementation group: 'org.json', name: 'json', version: '20231013'
     compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     compile 'org.hibernate.validator:hibernate-validator'
 
@@ -70,6 +70,8 @@ dependencies {
     compile 'org.jasypt:jasypt:1.9.3'
 
     compile 'io.zonky.test:embedded-postgres:2.0.6'
+    //Fix CVE-2024-25710, CVE-2024-26308
+    compile 'org.apache.commons:commons-compress:1.26.0'
     compile 'org.flywaydb:flyway-core:6.3.1'
 
     compile 'org.apache.jclouds.api:s3:2.5.0'

gradle.properties

@@ -1,2 +1,2 @@
-version=5.11.5
+version=5.11.7
 lombokVersion=1.18.30

src/main/java/com/epam/ta/reportportal/binary/impl/DataStoreUtils.java

@@ -17,6 +17,9 @@
 package com.epam.ta.reportportal.binary.impl;
 
 import com.google.common.base.Strings;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.tika.mime.MimeTypeException;
 import org.apache.tika.mime.MimeTypes;
@@ -25,10 +28,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Optional;
-
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>
  */