Release 5.12.0

.github/workflows/release.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  RELEASE_VERSION: 5.11.3
+  RELEASE_VERSION: 5.12.0
   REPOSITORY_URL: 'https://maven.pkg.github.com/'
 
 jobs:
@@ -31,7 +31,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Setup git credentials
-        uses: oleksiyrudenko/gha-git-credentials@v2
+        uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
           name: 'reportportal.io'
           email: '[email protected]'

.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

@@ -4,13 +4,12 @@ ARG APP_VERSION
 WORKDIR /usr/app
 COPY . /usr/app
 RUN if [ "${RELEASE_MODE}" = true ]; then \
-    gradle build --exclude-task test \
+    gradle build --no-build-cache --exclude-task test \
         -PreleaseMode=true \
         -Dorg.gradle.project.version=${APP_VERSION}; \
-    else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
+    else gradle build --no-build-cache --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
 
-# For ARM build use flag: `--platform linux/arm64`
-FROM --platform=$BUILDPLATFORM amazoncorretto:21.0.4
+FROM amazoncorretto:21.0.4
 LABEL version=${APP_VERSION} description="EPAM Report portal. Main API Service" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
 ARG APP_VERSION=${APP_VERSION}
 ENV APP_DIR=/usr/app
@@ -19,4 +18,5 @@ WORKDIR $APP_DIR
 COPY --from=build $APP_DIR/build/libs/service-api-*exec.jar .
 VOLUME ["/tmp"]
 EXPOSE 8080
-ENTRYPOINT exec java ${JAVA_OPTS} -jar ${APP_DIR}/service-api-*exec.jar
+# ENTRYPOINT exec java ${JAVA_OPTS} -jar ${APP_DIR}/service-api-*exec.jar
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar ${APP_DIR}/service-api-*exec.jar"]

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"
@@ -58,28 +57,20 @@ ext['spring-boot.version'] = '2.5.15'
 
 dependencyManagement {
     imports {
-        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:12.9.0')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + '5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
+        mavenBom('io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0')
     }
 }
 
 dependencies {
     if (releaseMode) {
-        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:5.11.1'
+        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:5.11.1'
+        implementation 'com.github.reportportal:commons-dao:acf1ec7'
+        implementation 'com.github.reportportal:commons:c8ef09c'
+        implementation 'com.github.reportportal:plugin-api:188792e'
     }
 
     implementation 'org.springframework.boot:spring-boot-starter-aop'
@@ -90,6 +81,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-amqp'
     implementation 'org.springframework.boot:spring-boot-starter-batch'
 
+    implementation 'org.springframework:spring-jdbc:6.1.5'
     //Fix CVE-2023-34050
     implementation 'org.springframework.amqp:spring-amqp:2.4.17'
 
@@ -114,17 +106,18 @@ dependencies {
     implementation "com.rabbitmq:http-client:5.2.0"
 
     implementation 'com.sun.mail:javax.mail:1.6.2'
-    // check authentication error response format for versions higher than 6.21.3
-    implementation 'net.sf.jasperreports:jasperreports:6.21.3'
+    implementation('net.sf.jasperreports:jasperreports:6.21.3') {
+        exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-xml'
+    }
     implementation 'xerces:xercesImpl:2.12.2'
     implementation 'com.lowagie:itext:2.1.7.js7'
     // Fix CVE-2020-15522 in com.lowagie:itext:2.1.7.js7
     implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
     // 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.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'
 
     ///// Security
     //https://nvd.nist.gov/vuln/detail/CVE-2020-5407 AND https://nvd.nist.gov/vuln/detail/CVE-2020-5408
@@ -194,7 +187,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('')

codecov.yaml

@@ -8,4 +8,6 @@ ignore:
   - "**/job/FlushingDataJob**"
   - "**/core/analyzer/auto/client/model/**"
   - "**/core/analyzer/auto/impl/SuggestedItem**"
-  - "**/core/item/impl/provider/impl/mock/**"
+  - "**/core/item/impl/provider/impl/mock/**"
+  - "**/reporting/async"
+  - "**/exception"

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.properties

@@ -1,4 +1,4 @@
-version=v5.11.4
+version=5.12.0
 description=EPAM Report portal. Main API Service
 dockerPrepareEnvironment=
 dockerJavaOpts=-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom

gradle/wrapper/gradle-wrapper.properties

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

project-properties.gradle

@@ -1,4 +1,3 @@
-
 def commonScriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/'
 def migrationsScriptsUrl = 'https://raw.githubusercontent.com/reportportal/migrations/'
 
@@ -8,15 +7,15 @@ project.ext {
     limits = [
             'instruction': 70,
             'branch'     : 51,
-            'line'       : 74,
+            'line'       : 72,
             'complexity' : 60,
             'method'     : 65,
             'class'      : 90
     ]
     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')
+    scriptsUrl = commonScriptsUrl + (releaseMode ? '5.12.0' : 'develop')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.12.0' : 'develop')
     //TODO refactor with archive download
     testScriptsSrc = [
             (migrationsUrl + '/migrations/0_extensions.up.sql')                        : 'V001__extensions.sql',
@@ -67,6 +66,9 @@ project.ext {
             (migrationsUrl + '/migrations/76_user_bid_extension.up.sql')               : 'V076__user_bid_extension.sql',
             (migrationsUrl + '/migrations/77_email_server_documentation_link.up.sql')  : 'V077__email_server_documentation_link.sql',
             (migrationsUrl + '/migrations/78_drop_redundant_index.up.sql')             : 'V078__drop_redundant_index.sql',
+            (migrationsUrl + '/migrations/84_notication_update.up.sql')                : 'V084__notication_update.sql',
+            (migrationsUrl + '/migrations/86_add_retention_policy_launch.up.sql')      : 'V086__add_retention_policy_launch.sql',
+            (migrationsUrl + '/migrations/88_analytics_data_table.up.sql')             : 'V088__analytics_data_table.sql',
     ]
     excludeTests = ['**/entity/**',
                     '**/aop/**',
@@ -77,7 +79,8 @@ 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/**'
     ]
 }