Merge branch 'develop' of github.com:reportportal/service-api into rc…

…/5.11.0

# Conflicts:
#	build.gradle
#	project-properties.gradle

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM gradle:8.4.0-jdk21 AS build
+FROM --platform=$BUILDPLATFORM gradle:8.5.0-jdk21 AS build
 ARG RELEASE_MODE
 ARG APP_VERSION
 WORKDIR /usr/app

build.gradle

@@ -18,13 +18,12 @@ plugins {
     id "io.spring.dependency-management" version "1.1.4"
     id 'org.springframework.boot' version '2.5.15'
     id 'java'
-    id "org.owasp.dependencycheck" version "8.2.1"
+    id "org.owasp.dependencycheck" version "9.0.9"
 }
 
 import org.owasp.dependencycheck.reporting.ReportGenerator
 
 apply from: 'project-properties.gradle'
-apply from: "$scriptsUrl/build-docker.gradle"
 apply from: "$scriptsUrl/build-commons.gradle"
 apply from: "$scriptsUrl/build-info.gradle"
 apply from: "$scriptsUrl/release-service.gradle"
@@ -73,13 +72,14 @@ dependencies {
         implementation 'com.epam.reportportal:commons-fonts'
         implementation 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.epam.reportportal:commons-events'
-        implementation 'com.epam.reportportal:commons-dao'
-        implementation 'com.epam.reportportal:commons-rules'
-        implementation 'com.epam.reportportal:commons-model'
-        implementation 'com.epam.reportportal:commons'
-        implementation 'com.epam.reportportal:commons-fonts'
-        implementation 'com.epam.reportportal:plugin-api'
+        implementation 'com.github.reportportal:commons-events:e337f8b7be'
+        implementation 'com.github.reportportal:commons-dao:b2c73ac'
+        implementation 'com.github.reportportal:commons-rules:1f6bfed'
+        implementation 'com.github.reportportal:commons-model:f466951'
+        implementation 'com.github.reportportal:commons-reporting:12c31b1'
+        implementation 'com.github.reportportal:commons:07566b8e'
+        implementation 'com.github.reportportal:commons-fonts:d6e62dd'
+        implementation 'com.github.reportportal:plugin-api:cc3c5c8'
     }
 
     implementation 'org.springframework.boot:spring-boot-starter-aop'
@@ -113,9 +113,11 @@ dependencies {
     implementation 'xerces:xercesImpl:2.12.2'
     implementation 'com.lowagie:itext:2.1.7.js7'
     // JasperReport's export to XLS uses Apache POI
-    implementation 'org.apache.poi:poi:4.1.2'
-    implementation 'io.springfox:springfox-swagger2:2.9.2'
+    implementation 'org.apache.poi:poi:5.2.3'
+    implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
     implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.api-client:google-api-client:2.3.0'
+    implementation 'joda-time:joda-time:2.12.7'
 
 
     ///// Security
@@ -181,7 +183,8 @@ dependencyCheck {
 }
 
 bootJar {
-    project.hasProperty('gcp') ? getArchiveFileName().set('app.jar') : archiveClassifier.set('exec')
+    project.hasProperty('gcp') ? getArchiveFileName().set('app.jar') : archiveClassifier.set('' +
+            'exec')
 }
 jar.enabled(true)
 jar.archiveClassifier.set('')

docker-compose.yml

@@ -24,11 +24,11 @@ services:
     ports:
       - "5432:5432"
 
-  elastic:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.3.0
+  opensearch:
+    image: opensearchproject/opensearch:2.11.0
     restart: always
     volumes:
-      - elastic:/usr/share/elasticsearch/data
+      - opensearch:/usr/share/opensearch/data
     environment:
       - "bootstrap.memory_lock=true"
       - "discovery.type=single-node"
@@ -77,5 +77,5 @@ services:
 
 volumes:
   reportportal-database:
-  elastic:
+  opensearch:
   minio:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

project-properties.gradle

@@ -16,7 +16,7 @@ project.ext {
     isDebugMode = System.getProperty("DEBUG", "false") == "true"
     releaseMode = project.hasProperty("releaseMode")
     scriptsUrl = commonScriptsUrl + (releaseMode ? '5.11.0' : 'develop')
-    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.11.0' : 'feature/settings')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.11.0' : 'develop')
     //TODO refactor with archive download
     testScriptsSrc = [
             (migrationsUrl + '/migrations/0_extensions.up.sql')                        : 'V001__extensions.sql',
@@ -77,10 +77,11 @@ project.ext {
                     '**/job/FlushingDataJob**',
                     "**/core/analyzer/auto/client/model/**",
                     '**/core/analyzer/auto/impl/SuggestedItem**',
-                    '**/core/item/impl/provider/impl/mock/**'
+                    '**/core/item/impl/provider/impl/mock/**',
+                    '**/model/**'
     ]
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '8.5'
 }

src/main/java/com/epam/ta/reportportal/auth/permissions/AssignedToProjectPermission.java

@@ -19,15 +19,16 @@
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.validation.BusinessRule;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
-
 /**
  * Check whether user assigned to project
  *

src/main/java/com/epam/ta/reportportal/auth/permissions/BaseProjectPermission.java

@@ -21,7 +21,7 @@
 import com.epam.ta.reportportal.entity.project.ProjectRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.util.ProjectExtractor;
-import com.epam.ta.reportportal.ws.model.ErrorType;
+import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.google.common.collect.Maps;
 import java.util.Map;
 import java.util.Objects;

src/main/java/com/epam/ta/reportportal/core/activity/ActivityHandler.java

@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.epam.ta.reportportal.core.activity;
 
 import com.epam.ta.reportportal.commons.ReportPortalUser;
 import com.epam.ta.reportportal.commons.querygen.Filter;
 import com.epam.ta.reportportal.commons.querygen.Queryable;
-import com.epam.ta.reportportal.ws.model.ActivityEventResource;
+import com.epam.ta.reportportal.model.ActivityEventResource;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
 import org.springframework.data.domain.Pageable;
 
@@ -32,16 +33,15 @@ public interface ActivityHandler {
    * Load list of {@link com.epam.ta.reportportal.ws.model.ActivityResource} for specified
    * {@link com.epam.ta.reportportal.entity.item.TestItem}
    *
-   * @param projectDetails     Details of project
-   *                           {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
-   * @param filter             Filter
-   * @param pageable           Page Details
-   * @param predefinedFilter   Additional filter
+   * @param projectDetails   Details of project
+   *                         {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
+   * @param filter           Filter
+   * @param pageable         Page Details
+   * @param predefinedFilter Additional filter
    * @return Found activities
    */
   Iterable<ActivityResource> getActivitiesHistory(ReportPortalUser.ProjectDetails projectDetails,
-      Filter filter,
-      Queryable predefinedFilter, Pageable pageable);
+      Filter filter, Queryable predefinedFilter, Pageable pageable);
 
   /**
    * Load {@link com.epam.ta.reportportal.ws.model.ActivityResource}
@@ -53,23 +53,22 @@ Iterable<ActivityResource> getActivitiesHistory(ReportPortalUser.ProjectDetails
    */
   ActivityResource getActivity(ReportPortalUser.ProjectDetails projectDetails, Long activityId);
 
-	/**
-	 * Load list of {@link com.epam.ta.reportportal.ws.model.ActivityEventResource} for specified
-	 * {@link com.epam.ta.reportportal.entity.item.TestItem}
-	 *
-	 * @param projectDetails Details of project
-	 *                       {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
-	 * @param itemId         ID of test item
-	 * @param filter         Filter
-	 * @param pageable       Page Details
-	 * @return Found activities
-	 */
-	Iterable<ActivityEventResource> getItemActivities(ReportPortalUser.ProjectDetails projectDetails,
-			Long itemId, Filter filter,
-			Pageable pageable);
+  /**
+   * Load list of {@link ActivityEventResource} for specified
+   * {@link com.epam.ta.reportportal.entity.item.TestItem}
+   *
+   * @param projectDetails Details of project
+   *                       {@link com.epam.ta.reportportal.commons.ReportPortalUser.ProjectDetails}
+   * @param itemId         ID of test item
+   * @param filter         Filter
+   * @param pageable       Page Details
+   * @return Found activities
+   */
+  Iterable<ActivityEventResource> getItemActivities(ReportPortalUser.ProjectDetails projectDetails,
+      Long itemId, Filter filter, Pageable pageable);
 
   /**
-   * Load list of {@link com.epam.ta.reportportal.ws.model.ActivityResource} for specified
+   * Load list of {@link ActivityResource} for specified
    * {@link com.epam.ta.reportportal.entity.project.Project}
    *
    * @param projectDetails Details of project {@link ReportPortalUser.ProjectDetails}