EPMRPP-97485 || Upgrade to java 21

.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/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

.github/workflows/release.yml

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

plugin-junit/build.gradle → build.gradle

@@ -1,11 +1,8 @@
-import com.github.spotbugs.SpotBugsTask
-
 plugins {
     id "io.spring.dependency-management" version "1.0.9.RELEASE"
     id 'java'
     id 'jacoco'
-    id "com.github.spotbugs" version "3.0.0"
-    id "com.moowork.node" version "1.3.1"
+    id "com.github.node-gradle.node" version "2.2.1"
 }
 
 
@@ -58,17 +55,6 @@ dependencies {
 
 }
 
-spotbugs {
-    sourceSets = [sourceSets.main]
-    reportLevel = "high"
-}
-tasks.withType(SpotBugsTask) {
-    reports {
-        xml.enabled false
-        html.enabled true
-    }
-}
-
 test {
     useJUnitPlatform()
     maxParallelForks = 1
@@ -77,7 +63,7 @@ test {
         exceptionFormat = 'short'
     }
     reports {
-        junitXml.enabled = true
+        junitXml.required = true
     }
 }
 
@@ -107,7 +93,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",
@@ -124,7 +110,7 @@ shadowJar {
     from("ui/build") {
         into("/resources")
     }
-    configurations = [project.configurations.compile]
+    configurations = [project.configurations.compileClasspath]
     zip64 true
     dependencies {
     }
@@ -136,9 +122,9 @@ task plugin(type: Jar) {
         with jar
     }
     into('lib') {
-        from configurations.compile
+        from configurations.compileClasspath
     }
-    extension('zip')
+    archiveExtension.set('zip')
 }
 
 task assemblePlugin(type: Copy) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

project-properties.gradle

@@ -1,12 +1,26 @@
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+def commonScriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/'
 
 project.ext {
+    publishRepo = "https://maven.pkg.github.com/reportportal/plugin-import-junit"
     releaseMode = project.hasProperty("releaseMode")
-    pluginsDir = "$buildDir/jars"
-
+    pluginsDir = "$buildDir/plugins"
+    scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop')
+    excludeTests = [
+            '**/entity/**',
+            '**/model/**',
+    ]
+    limits = [
+            'instruction': 30,
+            'branch'     : 17,
+            'line'       : 30,
+            'complexity' : 26,
+            'method'     : 29,
+            'class'      : 30
+    ]
 }
 
-wrapper {
-    gradleVersion = '8.5'
-}

settings.gradle

@@ -1,3 +1,2 @@
-rootProject.name = 'plugin-import-junit'
-include 'plugin-junit'
+rootProject.name = 'plugin-junit'