Release 5.12.1 (#35)

* EPMRPP-94504 improve rd jobs (#31)

* EPMRPP-94590 fix retrieving logs flow (#32)

* EPMRPP-94590 fix get logs

* EPMRPP-97485 || Upgrade to java 21 (#33)

* EPMRPP-97844 revert rdc logs logic (#34)

* Update include dependency

---------

Co-authored-by: Andrei Piankouski <[email protected]>

* Update versions

---------

Co-authored-by: Siarhei Hrabko <[email protected]>

.github/workflows/build.yml

@@ -18,11 +18,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

.github/workflows/release.yml

@@ -11,8 +11,8 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  SCRIPTS_VERSION: 5.12.0
-  BOM_VERSION: 5.12.1
+  SCRIPTS_VERSION: 5.12.1
+  BOM_VERSION: 5.13.0
 
 jobs:
   release:
@@ -21,11 +21,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

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "io.spring.dependency-management" version "1.0.9.RELEASE"
+    id "io.spring.dependency-management" version "1.1.4"
     id 'java'
 }
 
@@ -16,13 +16,13 @@ def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/
 
 apply from: scriptsUrl + '/release-fat.gradle'
 apply from: scriptsUrl + '/signing.gradle'
-apply from: scriptsUrl + '/build-quality.gradle'
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
 repositories {
-    maven { url "https://m2proxy.atlassian.com/repository/public" }
     mavenCentral { url "https://repo1.maven.org/maven2" }
 
     if (!releaseMode) {
@@ -32,7 +32,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.12.1')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.13.0')
     }
 }
 
@@ -42,18 +42,14 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:acf1ec7'
-        implementation 'com.github.reportportal:plugin-api:188792e'
-        annotationProcessor 'com.github.reportportal:plugin-api:188792e'
+        implementation 'com.github.reportportal:commons-dao:a98c172'
+        implementation 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
+        annotationProcessor 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
     }
     implementation 'org.hibernate:hibernate-core:5.6.15.Final'
 
-    // TODO: 2.5.3+ switched to camel-case models. UI updates required
-    implementation 'com.saucelabs:saucerest:2.5.1'
-    implementation 'dev.failsafe:failsafe:3.3.2'
-    implementation 'org.awaitility:awaitility:4.2.2'
-    implementation 'org.hamcrest:hamcrest-core:2.2'
-    runtimeOnly 'com.squareup.moshi:moshi:1.15.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
 
     // add lombok support
     compileOnly "org.projectlombok:lombok:${lombokVersion}"
@@ -63,17 +59,21 @@ dependencies {
 
 }
 
+test {
+    useJUnitPlatform()
+}
+
 generatePomFileForShadowPublication { pom.packaging = "jar" }
 
 jar {
     manifest {
         attributes(
-                "Class-Path": configurations.compile.collect { it.getName() }.join(' '),
-                "Plugin-Id": "${pluginID}",
+                "Class-Path": configurations.compileClasspath.collect { it.getName() }.join(' '),
+                "Plugin-Id": "${pluginId}",
                 "Plugin-Version": "${project.version}",
                 "Plugin-Provider": "Pavel Bortnik",
                 "Plugin-Class": "com.epam.reportportal.saucelabs.SaucelabsPlugin",
-//                "Plugin-Dependencies": ""
+                // "Plugin-Dependencies": ""
         )
     }
 }
@@ -82,25 +82,19 @@ shadowJar {
     archiveClassifier.set(null)
     zip64 true
     dependencies {
-        include(dependency('com.saucelabs:saucerest:2.5.1'))
-        include(dependency('org.json:json:20240303'))
-        include(dependency('org.awaitility:awaitility:4.2.2'))
-        include(dependency('org.hamcrest:hamcrest:2.2'))
-        include(dependency('com.squareup.moshi:moshi:1.15.1'))
-        include(dependency('net.jodah:failsafe:2.4.4'))
-
+        include(dependency('com.epam.reportportal:saucelabs:.*'))
     }
 }
 
 task plugin(type: Jar) {
-    baseName = "plugin-${pluginID}"
+    getArchiveBaseName().set("plugin-${pluginId}")
     into('classes') {
         with jar
     }
     into('lib') {
-        from configurations.compile
+        from configurations.compileClasspath
     }
-    extension('zip')
+    archiveExtension.set('zip')
 }
 
 task assemblePlugin(type: Copy) {
@@ -113,5 +107,5 @@ task assemblePlugins(type: Copy) {
 }
 
 wrapper {
-    gradleVersion = '6.0'
+    gradleVersion = '8.10.2'
 }

gradle.properties

@@ -1,2 +1,3 @@
 version=5.12.1
 lombokVersion=1.18.34
+pluginId = saucelabs

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists