EPMRPP-97485 || Update to java 21 (#67)

reportportal · Dec 3, 2024 · f88c845 · f88c845
1 parent 5d0c49b
commit f88c845
Show file tree

Hide file tree

Showing 10 changed files with 237 additions and 175 deletions.
diff --git a/.github/workflows/build.yml b/.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

diff --git a/.github/workflows/manually-release.yml b/.github/workflows/manually-release.yml
@@ -26,11 +26,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
@@ -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

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "io.spring.dependency-management" version "1.0.9.RELEASE"
     id 'java'
     id "com.github.node-gradle.node" version "2.2.1"
-    id 'nu.studer.jooq' version '3.0.3'
+    id "org.jooq.jooq-codegen-gradle" version "3.19.13"
 }
 
 apply from: 'project-properties.gradle'
@@ -36,29 +36,30 @@ 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'
 
-    compile 'com.squareup.okhttp:okhttp:2.7.5'
-    compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
-    compile 'io.gsonfire:gson-fire:1.8.0'
-    compile 'org.threeten:threetenbp:1.3.5'
+    implementation 'com.squareup.okhttp:okhttp:2.7.5'
+    implementation 'com.squareup.okhttp:logging-interceptor:2.7.5'
+    implementation 'io.gsonfire:gson-fire:1.8.0'
+    implementation 'org.threeten:threetenbp:1.3.5'
 
     implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
     implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
     implementation group: 'org.glassfish', name: 'javax.el', version: '3.0.0'
     implementation group: 'javax.el', name: 'javax.el-api', version: '3.0.0'
     implementation group: 'org.jooq', name: 'jooq', version: '3.14.4'
-    jooqRuntime 'org.postgresql:postgresql:42.7.3'
+    implementation 'org.postgresql:postgresql:42.7.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
+    testImplementation 'net.bytebuddy:byte-buddy:1.14.9'
 
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile 'org.mockito:mockito-core:3.12.4'
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
 }
 
 artifacts {
@@ -82,7 +83,7 @@ test {
         exceptionFormat = 'short'
     }
     reports {
-        junitXml.enabled = true
+        junitXml.required = true
     }
 }
 
@@ -97,7 +98,7 @@ jar {
     }
     manifest {
         attributes(
-                "Class-Path": configurations.compile.collect { it.getName() }.join(' '),
+                "Class-Path": configurations.compileClasspath.collect { it.getName() }.join(' '),
                 "Plugin-Id": "${pluginId}",
                 "Plugin-Version": "${project.version}",
                 "Plugin-Provider": "Report Portal",
@@ -114,7 +115,7 @@ shadowJar {
     from("ui/build") {
         into("/resources")
     }
-    configurations = [project.configurations.compile]
+    configurations = [project.configurations.compileClasspath]
     zip64 true
     dependencies {
     }
@@ -126,9 +127,9 @@ task plugin(type: Jar) {
         with jar
     }
     into('lib') {
-        from configurations.compile
+        from configurations.compileClasspath
     }
-    extension('zip')
+    archiveExtension.set('zip')
 }
 
 task assemblePlugin(type: Copy) {

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 14:15:13 MSK 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists