EPMRPP-93641 expose common dependencies

build.gradle

@@ -25,6 +25,11 @@ repositories {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 ext['spring-boot.version'] = "${springBootVersion}"
 
 dependencyManagement {
@@ -40,21 +45,17 @@ dependencies {
     } else {
         implementation 'com.github.reportportal:commons:e55b9e6'
     }
-
     // jooq dependencies
     api "org.jooq:jooq:${jooqVersion}"
     implementation "org.postgresql:postgresql:${jdbcDriverVersion}"
     jooqCodegen "org.postgresql:postgresql:${jdbcDriverVersion}"
 
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
-    implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
     implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
-    //implementation 'javax.servlet:javax.servlet-api:4.0.1' // get rid of unnecessary dep. and resolve conflicts with 'commons'
 
     implementation 'org.springframework.security:spring-security-core'
     implementation 'org.springframework:spring-webmvc'
     implementation 'org.apache.tika:tika-core'
-
     api('org.springframework.boot:spring-boot-starter-data-jpa') {
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
@@ -64,19 +65,19 @@ dependencies {
     implementation 'io.minio:minio:8.5.12'
 
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
-    api 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
+    implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
     implementation 'org.apache.commons:commons-collections4:4.4'
-    api 'commons-fileupload:commons-fileupload:1.5' // get rid of unnecessary dep. use spring multipart instead
-    api ('commons-validator:commons-validator:1.9.0') {
+    api ('commons-validator:commons-validator:1.9.0') { // for EmailValidator only
         exclude group: 'commons-beanutils', module: 'commons-beanutils'
     }
 
     api 'org.jasypt:jasypt:1.9.3'
 
     api 'io.zonky.test:embedded-postgres:2.0.7'
-    api 'org.apache.commons:commons-compress:1.26.1'
+    api 'org.apache.commons:commons-compress:1.27.1'
     implementation 'org.flywaydb:flyway-core:10.15.2'
+    implementation 'org.flywaydb:flyway-database-postgresql:10.20.0'
 
     api "org.apache.jclouds.api:s3:${jcloudsVersion}"
     api "org.apache.jclouds.provider:aws-s3:${jcloudsVersion}"
@@ -90,8 +91,6 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    implementation 'org.flywaydb:flyway-database-postgresql:10.20.0'
-
     testImplementation 'org.flywaydb.flyway-test-extensions:flyway-spring6-test:10.0.0'
 
 }

gradle.properties

@@ -2,5 +2,6 @@ version=5.11.7
 springBootVersion=3.3.5
 lombokVersion=1.18.34
 jooqVersion=3.19.13
-jdbcDriverVersion=42.7.3
+jdbcDriverVersion=42.7.4
 jcloudsVersion=2.6.0
+hibernateValidatorVersion=8.0.1.Final

project-properties.gradle

@@ -1,6 +1,3 @@
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
-
 def commonScriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/'
 def migrationsScriptsUrl = 'https://raw.githubusercontent.com/reportportal/migrations/'
 

src/main/java/com/epam/ta/reportportal/commons/querygen/QueryBuilder.java

@@ -41,7 +41,7 @@
 import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.stream.StreamSupport;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jooq.Condition;
 import org.jooq.Field;
@@ -367,4 +367,4 @@ public QueryBuilder addGroupByFields(Collection<? extends GroupField> fields) {
 
     return this;
   }
-}
+}

src/main/java/com/epam/ta/reportportal/dao/LaunchRepository.java

@@ -24,7 +24,6 @@
 import com.epam.ta.reportportal.entity.item.TestItemResults;
 import com.epam.ta.reportportal.entity.launch.Launch;
 import com.epam.ta.reportportal.entity.project.Project;
-import jakarta.persistence.NamedQuery;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.List;

src/main/java/com/epam/ta/reportportal/dao/custom/ElasticSearchClient.java

@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.jooq.tools.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/epam/ta/reportportal/util/FeatureFlagHandler.java

@@ -4,7 +4,7 @@
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;