Release 5.14.0

Author: APiankouski

.github/workflows/promote.yml

@@ -105,4 +105,4 @@ jobs:
           else
             echo 'Verification failed, please check the bundle' 1>&2
             exit 1
-          fi
+          fi

.github/workflows/release.yml

@@ -11,8 +11,8 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  SCRIPTS_VERSION: 5.12.0
-  BOM_VERSION: 5.13.4
+  SCRIPTS_VERSION: 5.14.0
+  BOM_VERSION: 5.14.0
 
 jobs:
   release:

build.gradle

@@ -1,12 +1,12 @@
 plugins {
-    id 'io.spring.dependency-management' version '1.1.6'
+    id 'io.spring.dependency-management' version '1.1.7'
     id 'java'
     id 'java-library'
-    id 'org.owasp.dependencycheck' version '11.1.0'
+    id 'org.owasp.dependencycheck' version '12.0.1'
 }
 
 project.ext {
-    releaseMode = project.hasProperty("releaseMode")
+    releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false
     publishRepo = "https://maven.pkg.github.com/reportportal/commons"
     dependencyRepos = ["commons-bom"]
 }
@@ -16,13 +16,15 @@ def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/
 
 apply from: scriptsUrl + '/release-commons.gradle'
 apply from: scriptsUrl + '/signing.gradle'
-//apply from: scriptsUrl + '/build-quality.gradle'
+//apply from: scriptsUrl + '/build-quality.gradle' // TODO: fix scripts
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21
 }
 
+ext['spring-boot.version'] = "${springBootVersion}"
+
 repositories {
     mavenCentral { url "https://repo1.maven.org/maven2" }
     if (!releaseMode) {
@@ -32,49 +34,55 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:2.1.5.RELEASE'
-        mavenBom('com.epam.reportportal:commons-bom:5.13.4')
+        mavenBom('com.epam.reportportal:commons-bom:5.14.0')
     }
 }
 
 dependencies {
     if (releaseMode) {
-        api 'com.epam.reportportal:commons-reporting:5.13.1'
+        api 'com.epam.reportportal:commons-reporting:5.14.0'
     } else {
-        api 'com.epam.reportportal:commons-reporting:5.13.1'
+        api 'com.github.reportportal:commons-reporting:56e3113'
     }
     api 'org.springframework:spring-webmvc'
     api 'org.springframework.security:spring-security-core'
     api 'org.apache.tika:tika-core'
 
-    implementation "org.springdoc:springdoc-openapi-data-rest:${sprindocAnnotationsVersion}"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:2.2.27"
     api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-    api "javax.validation:validation-api:${validationApiVersion}"
-    implementation "org.apache.commons:commons-lang3:${commonsLangVersion}"
-    implementation group: 'com.google.guava', name: 'guava', version: '28.2-jre'
-    implementation 'javax.servlet:javax.servlet-api'
+    api "org.apache.commons:commons-lang3:${commonsLangVersion}"
+    api "com.google.guava:guava:${guava}"
+    implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
+    implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
     implementation 'org.freemarker:freemarker'
     implementation 'ch.qos.logback:logback-classic'
-    implementation 'net.coobird:thumbnailator:0.4.11'
-    implementation 'com.google.guava:guava'
-    implementation 'javax.inject:javax.inject:1'
+    implementation 'net.coobird:thumbnailator:0.4.20'
+    implementation 'jakarta.inject:jakarta.inject-api:2.0.1'
 
     // add lombok support
     compileOnly "org.projectlombok:lombok:${lombokVersion}"
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
     testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
     testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
-    testImplementation "junit:junit:${junitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockitoJunitJupiter}"
-    testImplementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
-    testImplementation "javax.el:javax.el-api:${elApiVersion}"
-    testImplementation "org.glassfish:javax.el:${elApiVersion}"
+    testImplementation "org.hamcrest:hamcrest:2.2"
+    testImplementation "org.glassfish:jakarta.el:4.0.2"
 }
 
-wrapper {
-    gradleVersion = '8.10'
+test {
+    useJUnitPlatform()
+    testLogging {
+        events = ['failed']
+        exceptionFormat = 'short'
+    }
+    reports {
+        junitXml.required = true
+    }
 }
 
 tasks.preTagCommit.enabled = false

gradle.properties

@@ -1,11 +1,10 @@
-version=5.13.2
+version=5.14.0
 description=EPAM Report portal common libs
-hibernateValidatorVersion=6.2.0.Final
-validationApiVersion=2.0.1.Final
-junitVersion=4.13.1
-elApiVersion=3.0.0
-sprindocAnnotationsVersion=1.7.0
-commonsLangVersion=3.9
-mockitoJunitJupiter=2.23.0
-jacksonVersion=2.13.4.2
-lombokVersion=1.18.30
+hibernateValidatorVersion=8.0.2.Final
+junitVersion=5.11.4
+springBootVersion=3.4.2
+commonsLangVersion=3.17.0
+mockitoJunitJupiter=5.14.2
+jacksonVersion=2.18.2
+lombokVersion=1.18.36
+guava=33.2.1-jre

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.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

jitpack.yml

@@ -1,2 +1,2 @@
 jdk:
-  - openjdk21
+  - openjdk21

src/main/java/com/epam/reportportal/annotations/NotBlankString.java

@@ -16,12 +16,12 @@
 
 package com.epam.reportportal.annotations;
 
+import jakarta.validation.Constraint;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
 
 /**
  * Can be used with strings. Checks if string is blank.

src/main/java/com/epam/reportportal/annotations/NotBlankStringCollection.java

@@ -16,12 +16,12 @@
 
 package com.epam.reportportal.annotations;
 
+import jakarta.validation.Constraint;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.validation.Constraint;
 
 /**
  * Can be used with collection of strings. Checks if collection contains only not blank elements.

src/main/java/com/epam/reportportal/annotations/NotBlankStringCollectionValidator.java

@@ -16,9 +16,9 @@
 
 package com.epam.reportportal.annotations;
 
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import java.util.Collection;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>

src/main/java/com/epam/reportportal/annotations/NotBlankStringValidator.java

@@ -16,8 +16,8 @@
 
 package com.epam.reportportal.annotations;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 /**
  * @author <a href="mailto:ihar_kahadouski@epam.com">Ihar Kahadouski</a>