EPMRPP-87048 || Move authorization service 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

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

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.8.3-jdk11 AS build
+FROM gradle:8.4.0-jdk21 AS build
 ARG RELEASE_MODE
 ARG APP_VERSION
 ARG GITHUB_USER
@@ -14,7 +14,7 @@ RUN if [ "${RELEASE_MODE}" = true ]; then \
     else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
 
 # For ARM build use flag: `--platform linux/arm64`
-FROM --platform=$BUILDPLATFORM amazoncorretto:11.0.20
+FROM amazoncorretto:21.0.1
 LABEL version=${APP_VERSION} description="EPAM ReportPortal. Auth Service" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
 ARG APP_VERSION=${APP_VERSION}
 ENV APP_DIR=/usr/app

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'io.spring.dependency-management' version '1.0.9.RELEASE'
-    id 'org.springframework.boot' version '2.5.14'
+    id 'org.springframework.boot' version '2.7.16'
     id 'java'
     id "org.owasp.dependencycheck" version "5.3.1"
 }
@@ -49,61 +49,59 @@ dependencyManagement {
 
 dependencies {
     if (releaseMode) {
-        compile 'com.epam.reportportal:commons-dao'
-        compile 'com.epam.reportportal:commons-rules'
-        compile 'com.epam.reportportal:commons-model'
+        implementation 'com.epam.reportportal:commons-dao'
+        implementation 'com.epam.reportportal:commons-rules'
+        implementation 'com.epam.reportportal:commons-model'
     } else {
-        compile 'com.github.reportportal:commons-dao:f042158b'
-        compile 'com.github.reportportal:commons-rules:933ff17d'
-        compile 'com.github.reportportal:commons-model:232e69a5'
+        implementation 'com.github.reportportal:commons-dao:f042158b'
+        implementation 'com.github.reportportal:commons-rules:933ff17d'
+        implementation 'com.github.reportportal:commons-model:232e69a5'
     }
 
-    //Fix CVE-2021-41079, CVE-2022-23181, CVE-2021-33037, CVE-2021-30640, CVE-2022-42252
-    compile 'org.apache.tomcat.embed:tomcat-embed-core:9.0.68'
-    compile 'org.apache.tomcat.embed:tomcat-embed-el:9.0.68'
-    compile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.68'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.81'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.68'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.68'
     //Fix CVE-2020-15522
-    compile 'org.bouncycastle:bcprov-jdk15on:1.69'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.69'
     //Fix CVE-2015-7501, CVE-2015-4852
-    compile 'commons-collections:commons-collections:3.2.2'
-    //Fix CVE-2018-10237
-    compile 'com.google.guava:guava:24.1.1-jre'
+    implementation 'commons-collections:commons-collections:3.2.2'
+    implementation 'com.google.guava:guava:32.1.3-jre'
     //Fix CVE-2020-13956
-    compile 'org.apache.httpcomponents:httpclient:4.5.13'
+    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
     //Fix CVE-2022-40152
-    compile 'com.fasterxml.woodstox:woodstox-core:5.4.0'
+    implementation 'com.fasterxml.woodstox:woodstox-core:5.4.0'
 
-    compile 'org.springframework.boot:spring-boot-starter-web'
-    compile 'org.springframework.boot:spring-boot-starter-actuator'
-    compile 'org.springframework.boot:spring-boot-starter-security'
-    compile 'org.springframework.boot:spring-boot-starter-amqp'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-amqp'
 
     ///// Security
     //https://nvd.nist.gov/vuln/detail/CVE-2020-5407 AND https://nvd.nist.gov/vuln/detail/CVE-2020-5408
-    compile 'org.springframework.security:spring-security-core:5.5.8'
-    compile 'org.springframework.security:spring-security-config:5.5.8'
-    compile 'org.springframework.security:spring-security-web:5.5.8'
+    implementation 'org.springframework.security:spring-security-core:5.5.8'
+    implementation 'org.springframework.security:spring-security-config:5.5.8'
+    implementation 'org.springframework.security:spring-security-web:5.5.8'
     //
 
-    compile 'org.springframework.security:spring-security-oauth2-client'
+    implementation 'org.springframework.security:spring-security-oauth2-client'
     //Fix CVE-2022-22969
-    compile 'org.springframework.security.oauth:spring-security-oauth2:2.5.2.RELEASE'
-    compile 'org.springframework.security:spring-security-jwt:1.0.11.RELEASE'
-    compile 'org.springframework.security:spring-security-ldap'
-    compile 'org.springframework.security.extensions:spring-security-saml2-core:2.0.0.M31'
+    implementation 'org.springframework.security.oauth:spring-security-oauth2:2.5.2.RELEASE'
+    implementation 'org.springframework.security:spring-security-jwt:1.0.11.RELEASE'
+    implementation 'org.springframework.security:spring-security-ldap'
+    implementation 'org.springframework.security.extensions:spring-security-saml2-core:2.0.0.M31'
 //  Temporary fix of https://nvd.nist.gov/vuln/detail/CVE-2019-12400
-    compile 'org.apache.santuario:xmlsec:2.1.7'
-
-    compile 'org.apache.tika:tika-core'
-
-    compile 'javax.inject:javax.inject:1'
-    compile 'io.springfox:springfox-swagger2'
-    compile 'org.apache.commons:commons-compress:1.21'
-    compile 'org.cryptacular:cryptacular:1.1.4'
-    compile 'org.yaml:snakeyaml:1.32'
-    compile 'org.hibernate:hibernate-core:5.4.24.Final'
-    compile 'org.springframework:spring-core:5.3.20'
-    compile "com.rabbitmq:http-client:2.1.0.RELEASE"
+    implementation 'org.apache.santuario:xmlsec:2.1.7'
+
+    implementation 'org.apache.tika:tika-core'
+
+    implementation 'javax.inject:javax.inject:1'
+    implementation 'io.springfox:springfox-swagger2'
+    implementation 'org.apache.commons:commons-compress:1.21'
+    implementation 'org.cryptacular:cryptacular:1.1.4'
+    implementation 'org.yaml:snakeyaml:1.32'
+    implementation 'org.hibernate:hibernate-core:5.4.24.Final'
+    implementation 'org.springframework:spring-core:5.3.20'
+    implementation "com.rabbitmq:http-client:2.1.0.RELEASE"
 }
 
 processResources {

gradle/wrapper/gradle-wrapper.properties

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

project-properties.gradle

@@ -7,10 +7,10 @@ project.ext {
     publishRepo = "https://maven.pkg.github.com/reportportal/service-authorization"
     dependencyRepos = ["commons-dao", "commons-rules", "commons-model", "commons-bom"]
     releaseMode = project.hasProperty("releaseMode")
-    scriptsUrl = commonScriptsUrl + (releaseMode ? '5.10.0' : 'master')
+    scriptsUrl = commonScriptsUrl + (releaseMode ? '5.10.0' : 'EPMRPP-85756')
     isDebugMode = System.getProperty("DEBUG", "false") == "true"
 }
 
 wrapper {
-    gradleVersion = '6.8'
+    gradleVersion = '8.4'
 }