Release 5.12.0

.github/workflows/sync-jira-versions.yml

@@ -0,0 +1,13 @@
+name: Add GitHub release version to Jira issues
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  call-jira-sync:
+    name: Call Jira versions update
+    uses: reportportal/.github/.github/workflows/update-jira-versions.yaml@main
+    with:
+      jira-server: ${{ vars.JIRA_SERVER }}
+    secrets: inherit

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM gradle:8.4.0-jdk21 AS build
+FROM --platform=$BUILDPLATFORM gradle:8.10.0-jdk21 AS build
 ARG RELEASE_MODE
 ARG APP_VERSION
 WORKDIR /usr/app
@@ -10,7 +10,7 @@ RUN if [ "${RELEASE_MODE}" = true ]; then \
     else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
 
 # For ARM build use flag: `--platform linux/arm64`
-FROM --platform=$BUILDPLATFORM amazoncorretto:21.0.1
+FROM  amazoncorretto:21.0.4
 LABEL version=${APP_VERSION} description="EPAM Report portal. Jobs Service" maintainer="Andrei Varabyeu <andrei_varabyeu@epam.com>, Hleb Kanonik <hleb_kanonik@epam.com>"
 ARG APP_VERSION=${APP_VERSION}
 ENV APP_DIR=/usr/app

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.17'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '2.7.18'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
 }
 
@@ -11,9 +11,8 @@ project.ext {
 
 ext['junit-jupiter.version'] = '5.10.0'
 
-def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.11.0' : 'EPMRPP-85756')
+def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.12.0' : 'develop')
 
-apply from: "$scriptsUrl/build-docker.gradle"
 apply from: "$scriptsUrl/build-commons.gradle"
 apply from: "$scriptsUrl/build-info.gradle"
 //apply from: "$scriptsUrl/build-quality.gradle"
@@ -26,7 +25,7 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '8.10'
 }
 
 bootJar {
@@ -54,7 +53,8 @@ ext['log4j2.version'] = '2.21.1'
 ext['log4j-to-slf4j.version'] = '2.21.1'
 //https://nvd.nist.gov/vuln/detail/CVE-2022-26520
 ext['postgresql.version'] = '42.6.1'
-ext['snakeyaml.version'] = '1.33'
+ext['snakeyaml.version'] = '2.2'
+ext['spring-boot.version'] = '2.7.18'
 //
 
 dependencies {
@@ -91,6 +91,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-amqp'
+    implementation 'org.springframework:spring-jdbc:6.1.5'
     implementation 'org.apache.jclouds.api:s3:2.5.0'
     implementation 'org.apache.jclouds.provider:aws-s3:2.5.0'
     implementation 'org.apache.jclouds.api:filesystem:2.5.0'

gradle.properties

@@ -1,4 +1,4 @@
-version=5.11.2
+version=5.12.0
 description=EPAM Report portal. Service jobs
 dockerServerUrl=unix:///var/run/docker.sock
 dockerPrepareEnvironment=

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/com/epam/reportportal/config/JacksonConfiguration.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2024 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.epam.reportportal.config;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Siarhei Hrabko
+ */
+@Configuration
+public class JacksonConfiguration {
+
+  /**
+   * @return Configured object mapper
+   */
+  @Bean(name = "objectMapper")
+  public ObjectMapper objectMapper() {
+    ObjectMapper om = new ObjectMapper();
+    om.setAnnotationIntrospector(new JacksonAnnotationIntrospector());
+    om.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, true);
+    om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    om.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+    om.registerModule(new JavaTimeModule());
+    return om;
+  }
+}

src/main/java/com/epam/reportportal/config/rabbit/BackgroundProcessingConfiguration.java

@@ -15,7 +15,7 @@
  * @author <a href="mailto:maksim_antonov@epam.com">Maksim Antonov</a>
  */
 @Configuration
-@ConditionalOnProperty(prefix = "rp.elasticsearch", name = "host")
+@ConditionalOnProperty(prefix = "rp.searchengine", name = "host")
 public class BackgroundProcessingConfiguration {
 
   public static final String LOG_MESSAGE_SAVING_QUEUE_NAME = "log_message_saving";

src/main/java/com/epam/reportportal/elastic/EmptyElasticSearchClient.java → src/main/java/com/epam/reportportal/elastic/EmptySearchEngineClient.java

@@ -5,12 +5,12 @@
 import org.springframework.stereotype.Service;
 
 /**
- * Empty client to work with Elasticsearch.
+ * Empty client to work with Search engine.
  *
  * @author <a href="mailto:maksim_antonov@epam.com">Maksim Antonov</a>
  */
 @Service
-public class EmptyElasticSearchClient implements ElasticSearchClient {
+public class EmptySearchEngineClient implements SearchEngineClient {
 
   @Override
   public void save(List<LogMessage> logMessageList) {

src/main/java/com/epam/reportportal/elastic/ElasticSearchClient.java → src/main/java/com/epam/reportportal/elastic/SearchEngineClient.java

@@ -4,11 +4,11 @@
 import java.util.List;
 
 /**
- * Client interface to work with Elasticsearch.
+ * Client interface to work with Search engine.
  *
  * @author <a href="mailto:maksim_antonov@epam.com">Maksim Antonov</a>
  */
-public interface ElasticSearchClient {
+public interface SearchEngineClient {
 
   void save(List<LogMessage> logMessageList);
 

src/main/java/com/epam/reportportal/elastic/SimpleElasticSearchClient.java → src/main/java/com/epam/reportportal/elastic/SimpleSearchEngineClient.java

@@ -19,23 +19,23 @@
 import org.springframework.web.client.RestTemplate;
 
 /**
- * Simple client to work with Elasticsearch.
+ * Simple client to work with Search engine.
  *
  * @author <a href="mailto:maksim_antonov@epam.com">Maksim Antonov</a>
  */
 @Primary
 @Service
-@ConditionalOnProperty(prefix = "rp.elasticsearch", name = "host")
-public class SimpleElasticSearchClient implements ElasticSearchClient {
+@ConditionalOnProperty(prefix = "rp.searchengine", name = "host")
+public class SimpleSearchEngineClient implements SearchEngineClient {
 
-  protected final Logger LOGGER = LoggerFactory.getLogger(SimpleElasticSearchClient.class);
+  protected final Logger LOGGER = LoggerFactory.getLogger(SimpleSearchEngineClient.class);
 
   private final String host;
   private final RestTemplate restTemplate;
 
-  public SimpleElasticSearchClient(@Value("${rp.elasticsearch.host}") String host,
-      @Value("${rp.elasticsearch.username:}") String username,
-      @Value("${rp.elasticsearch.password:}") String password) {
+  public SimpleSearchEngineClient(@Value("${rp.searchengine.host}") String host,
+      @Value("${rp.searchengine.username:}") String username,
+      @Value("${rp.searchengine.password:}") String password) {
     restTemplate = new RestTemplate();
 
     if (!username.isEmpty() && !password.isEmpty()) {