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

.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

@@ -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,21 +16,23 @@ 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 {
+    mavenCentral { url "https://repo1.maven.org/maven2" }
+
     if (!releaseMode) {
         maven { url 'https://jitpack.io' }
     }
-    mavenCentral { url "https://repo1.maven.org/maven2" }
 }
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.11.0')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.12.1')
     }
 }
 
@@ -40,9 +42,9 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:4caa252'
-        implementation 'com.github.reportportal:plugin-api:bc00459'
-        annotationProcessor 'com.github.reportportal:plugin-api:bc00459'
+        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'
 
@@ -66,8 +68,8 @@ 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",
@@ -85,14 +87,14 @@ shadowJar {
 }
 
 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) {
@@ -105,5 +107,5 @@ task assemblePlugins(type: Copy) {
 }
 
 wrapper {
-    gradleVersion = '6.0'
+    gradleVersion = '8.10.2'
 }

gradle.properties

@@ -1,2 +1,3 @@
-version=5.11.0
+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