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

Author: APiankouski

.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

@@ -11,8 +11,8 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  SCRIPTS_VERSION: 5.10.0
-  BOM_VERSION: 5.11.2
+  SCRIPTS_VERSION: 5.12.1
+  BOM_VERSION: 5.13.0
   REPOSITORY_URL: 'https://maven.pkg.github.com/'
 
 jobs:
@@ -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

.travis.yml

@@ -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'
     id 'jacoco'
 }
@@ -17,7 +17,6 @@ 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'
 
 repositories {
     maven { url "https://m2proxy.atlassian.com/repository/public" }
@@ -30,40 +29,42 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.11.2')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.13.0')
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
 dependencies {
     if (releaseMode) {
         implementation 'com.epam.reportportal:commons-dao'
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:2834dd5'
-        implementation 'com.github.reportportal:plugin-api:6465099'
-        annotationProcessor 'com.github.reportportal:plugin-api:6465099'
+        implementation 'com.github.reportportal:commons-dao:8dcc514'
+        implementation 'com.github.reportportal:plugin-api:815c74a'
+        annotationProcessor 'com.github.reportportal:plugin-api:815c74a'
     }
     implementation 'org.hibernate:hibernate-core:5.6.15.Final'
 
-    compile 'ch.qos.logback:logback-classic:1.2.3'
-    compile 'org.slf4j:slf4j-api:1.7.25'
+    implementation 'ch.qos.logback:logback-classic:1.2.3'
+    implementation 'org.slf4j:slf4j-api:1.7.25'
 
-    compile 'io.atlassian.fugue:fugue:4.7.2'
-    compile 'com.atlassian.jira:jira-rest-java-client-core:5.2.4'
+    implementation 'io.atlassian.fugue:fugue:4.7.2'
+    implementation 'com.atlassian.jira:jira-rest-java-client-core:5.2.4'
 
-    compile 'net.oauth.core:oauth:20090617'
-    compile 'net.oauth.core:oauth-httpclient4:20090913'
+    implementation 'net.oauth.core:oauth:20090617'
+    implementation 'net.oauth.core:oauth-httpclient4:20090913'
 
-    compile 'org.apache.tika:tika-core:1.14'
+    implementation 'org.apache.tika:tika-core:1.14'
 
-    testCompile 'org.springframework:spring-test:5.2.1.RELEASE'
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-all:1.10.19'
+    testImplementation 'org.springframework:spring-test:5.2.1.RELEASE'
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-all:1.10.19'
 }
 
 artifacts {
@@ -73,23 +74,23 @@ artifacts {
 test {
     jacocoTestReport {
         reports {
-            xml.enabled true
+            xml.required = true
         }
     }
 }
 
 build.dependsOn jacocoTestReport
 
 wrapper {
-    gradleVersion = '5.4.1'
+    gradleVersion = '8.10.2'
 }
 
 generatePomFileForShadowPublication { pom.packaging = "jar" }
 
 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": "Andrei Varabyeu",
@@ -101,18 +102,32 @@ jar {
 }
 
 shadowJar {
-    archiveClassifier.set(null)
-    configurations = [project.configurations.compile]
+    configurations = [project.configurations.compileClasspath]
     zip64 true
     dependencies {
-        exclude(dependency('com.github.reportportal:'))
-        exclude(dependency('com.epam.reportportal:'))
-        exclude(dependency('org.springframework:'))
-        exclude(dependency('org.springframework.security:'))
-        exclude(dependency('org.springframework.data:'))
-        exclude(dependency('org.springframework.boot:'))
-        exclude(dependency('ch.qos.logback:'))
-        exclude(dependency('org.slf4j:'))
+        include(dependency("com.atlassian.jira:jira-rest-java-client-api:.*"))
+        include(dependency("com.atlassian.jira:jira-rest-java-client-core:.*"))
+        include(dependency("com.atlassian.httpclient:atlassian-httpclient-api:.*"))
+        include(dependency("com.atlassian.httpclient:atlassian-httpclient-library:.*"))
+        include(dependency("com.atlassian.sal:sal-api:.*"))
+        include(dependency("com.atlassian.event:atlassian-event:.*"))
+        include(dependency("io.atlassian.util.concurrent:atlassian-util-concurrent:.*"))
+        include(dependency("io.atlassian.fugue:fugue:.*"))
+        include(dependency("org.apache.httpcomponents:httpasyncclient:.*"))
+        include(dependency("org.apache.httpcomponents:httpasyncclient-cache:.*"))
+        include(dependency("org.apache.httpcomponents:httpclient:.*"))
+        include(dependency("org.apache.httpcomponents:httpclient-cache:.*"))
+        include(dependency("org.apache.httpcomponents:httpcore:.*"))
+        include(dependency("org.apache.httpcomponents:httpcore-nio:.*"))
+        include(dependency("org.apache.httpcomponents:httpcore-mime:.*"))
+        include(dependency("org.glassfish.jersey.core:jersey-server:.*"))
+        include(dependency("org.glassfish.jersey.core:jersey-common:.*"))
+        include(dependency("jakarta.ws.rs:jakarta.ws.rs-api:.*"))
+        //include(dependency("jakarta.annotation:jakarta.annotation-api:.*"))
+        include(dependency("org.apache.tomcat:tomcat-annotations-api:.*"))
+        include(dependency("org.glassfish.hk2.external:jakarta.inject:.*"))
+        include(dependency("org.glassfish.hk2:osgi-resource-locator:.*"))
+        include(dependency("org.glassfish.jaxb:jaxb-runtime:.*"))
     }
 }
 
@@ -122,9 +137,9 @@ task plugin(type: Jar) {
         with jar
     }
     into('lib') {
-        from configurations.compile
+        from configurations.compileClasspath
     }
-    extension('zip')
+    archiveExtension.set('zip')
 }
 
 task assemblePlugin(type: Copy) {

build.gradle

@@ -1,2 +1,2 @@
-version=5.11.0
+version=5.12.1
 description=EPAM Report portal. Jira Integration Plugin

gradle.properties

@@ -1,6 +1,7 @@
-#Mon Feb 17 14:41:54 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