Merge branch 'develop' into feature/orgs

# Conflicts: # build.gradle # jitpack.yml
reportportal · Dec 9, 2024 · 239b084 · 239b084
2 parents 05c74a8 + 1e6fe09
commit 239b084
Show file tree

Hide file tree

Showing 12 changed files with 260 additions and 194 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,11 +19,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '21'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/manually-release.yml b/.github/workflows/manually-release.yml
@@ -31,11 +31,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '21'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,10 +11,10 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  SCRIPTS_VERSION: 5.11.0
-  BOM_VERSION: 5.11.7
-  MIGRATIONS_VERSION: 5.11.0
-  RELEASE_VERSION: 5.11.6
+  SCRIPTS_VERSION: 5.12.0
+  BOM_VERSION: 5.12.1
+  MIGRATIONS_VERSION: 5.12.0
+  RELEASE_VERSION: 5.12.1
 
 jobs:
   release:
@@ -23,11 +23,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '21'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/build.gradle b/build.gradle
@@ -4,16 +4,16 @@ plugins {
     id 'io.spring.dependency-management' version '1.0.9.RELEASE'
     id 'java'
     id 'java-library'
-    id 'nu.studer.jooq' version '3.0.3'
-    id 'org.owasp.dependencycheck' version '5.3.1'
+    id 'org.owasp.dependencycheck' version '11.1.0'
+    id "org.jooq.jooq-codegen-gradle" version "${jooqVersion}"
 }
 
 apply from: 'project-properties.gradle'
 apply from: "$scriptsUrl/release-commons.gradle"
 apply from: "$scriptsUrl/signing.gradle"
 apply from: "$scriptsUrl/copy-database-scripts.gradle"
-apply from: "$scriptsUrl/build-quality.gradle"
-apply from: "$scriptsUrl/jacoco.gradle"
+//apply from: "$scriptsUrl/build-quality.gradle"
+//apply from: "$scriptsUrl/jacoco.gradle"
 apply from: 'jooq.gradle'
 
 repositories {
@@ -24,18 +24,25 @@ repositories {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+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(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) {
-        compile 'com.epam.reportportal:commons'
+        implementation 'com.epam.reportportal:commons'
     } else {
-        implementation 'com.github.reportportal:commons:287df6c'
+        implementation 'com.github.reportportal:commons:596fceb'
     }
 
     implementation 'io.swagger.core.v3:swagger-annotations:2.2.9'
@@ -44,39 +51,37 @@ dependencies {
     implementation 'org.apache.tika:tika-core'
 
     //https://nvd.nist.gov/vuln/detail/CVE-2020-10683 (dom4j 2.1.3 version dependency) AND https://nvd.nist.gov/vuln/detail/CVE-2019-14900
-    compile('org.springframework.boot:spring-boot-starter-data-jpa') {
+    api('org.springframework.boot:spring-boot-starter-data-jpa') {
         exclude group: 'org.hibernate', module: 'hibernate-core'
     }
     implementation 'org.springframework:spring-jdbc:5.3.33'
     implementation 'org.hibernate:hibernate-core:5.6.15.Final'
     //
 
     //https://nvd.nist.gov/vuln/detail/CVE-2020-13692
-    compile 'org.postgresql:postgresql:42.7.3'
-    compile 'org.jooq:jooq'
-    jooqRuntime 'org.postgresql:postgresql:42.7.3'
+    implementation 'org.postgresql:postgresql:42.7.3'
+    api 'org.jooq:jooq'
 
-    compile 'io.minio:minio:6.0.13'
+    implementation 'io.minio:minio:6.0.13'
 
     implementation group: 'org.json', name: 'json', version: '20231013'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
-    compile 'org.hibernate.validator:hibernate-validator'
+    api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+    implementation 'org.hibernate.validator:hibernate-validator'
 
-    compile 'org.apache.commons:commons-collections4:4.4'
-    compile 'commons-fileupload:commons-fileupload:1.4'
-    compile('commons-validator:commons-validator:1.6') {
+    api 'org.apache.commons:commons-collections4:4.4'
+    api 'commons-fileupload:commons-fileupload:1.4'
+    api('commons-validator:commons-validator:1.6') {
         exclude group: 'commons-beanutils', module: 'commons-beanutils'
     }
 
-    compile 'org.jasypt:jasypt:1.9.3'
+    api 'org.jasypt:jasypt:1.9.3'
 
-    compile 'io.zonky.test:embedded-postgres:2.0.6'
-    //Fix CVE-2024-25710, CVE-2024-26308
-    compile 'org.apache.commons:commons-compress:1.26.0'
-    compile 'org.flywaydb:flyway-core:6.3.1'
+    api 'io.zonky.test:embedded-postgres:2.0.6'
+    api 'org.apache.commons:commons-compress:1.26.0'
+    implementation 'org.flywaydb:flyway-core:6.3.1'
 
-    compile 'org.apache.jclouds.api:s3:2.5.0'
-    compile 'org.apache.jclouds.provider:aws-s3:2.5.0'
+    api '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'
 
     // add lombok support
@@ -87,17 +92,18 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'com.github.ben-manes.caffeine:caffeine'
 
+    testImplementation 'net.bytebuddy:byte-buddy:1.14.9'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.flywaydb.flyway-test-extensions:flyway-spring-test:6.1.0'
+    testImplementation 'org.ow2.asm:asm:9.5'
+    testImplementation 'org.ow2.asm:asm-util:9.5'
 
 }
 
 dependencyCheck {
     formats = [ReportGenerator.Format.HTML, ReportGenerator.Format.XML]
 }
 
-test.onlyIf { false }
-
 test {
     useJUnitPlatform()
     testLogging {
@@ -115,4 +121,4 @@ tasks.withType(JavaCompile) {
 
 checkCommitNeeded.dependsOn removeScripts
 test.dependsOn copyTestDatabaseScripts
-build.dependsOn jacocoTestReport
+//build.dependsOn jacocoTestReport
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
-version=5.11.7
-lombokVersion=1.18.30
+version=5.12.2
+lombokVersion=1.18.30
+jooqVersion=3.19.13
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Mar 13 21:13:13 MSK 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists