Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	build.gradle

.github/workflows/manually-release.yml

@@ -28,17 +28,17 @@ 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
 
       - name: Setup git credentials
-        uses: oleksiyrudenko/gha-git-credentials@v2
+        uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
           name: 'reportportal.io'
           email: 'support@reportportal.io'

.github/workflows/release.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  RELEASE_VERSION: 5.11.3
+  RELEASE_VERSION: 5.12.0
 
 jobs:
   release:
@@ -20,17 +20,17 @@ 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
 
       - name: Setup git credentials
-        uses: oleksiyrudenko/gha-git-credentials@v2
+        uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
           name: 'reportportal.io'
           email: 'support@reportportal.io'

docker-compose.yml

@@ -111,7 +111,7 @@ services:
   ## ReportPortal services
 
   index:
-    image: reportportal/service-index:5.11.0
+    image: reportportal/service-index:5.12.0
     container_name: reportportal-index
     logging:
       <<: *logging
@@ -138,7 +138,7 @@ services:
     restart: always
 
   ui:
-    image: reportportal/service-ui:5.11.1
+    image: reportportal/service-ui:5.12.0
     container_name: reportportal-ui
     environment:
       RP_SERVER_PORT: "8080"
@@ -161,7 +161,7 @@ services:
     restart: always
 
   api:
-    image: reportportal/service-api:5.11.1
+    image: reportportal/service-api:5.12.0
     container_name: reportportal-api
     logging:
       <<: *logging
@@ -276,7 +276,7 @@ services:
     restart: always
 
   jobs:
-    image: reportportal/service-jobs:5.11.1
+    image: reportportal/service-jobs:5.12.0
     container_name: reportportal-jobs
     logging:
       <<: *logging
@@ -349,7 +349,7 @@ services:
     restart: always
 
   analyzer:
-    image: &analyzer_img reportportal/service-auto-analyzer:5.11.0-r1
+    image: &analyzer_img reportportal/service-auto-analyzer:5.12.0-r1
     container_name: reportportal-analyzer
     logging:
       <<: *logging
@@ -401,7 +401,7 @@ services:
     restart: always
 
   metrics-gatherer:
-    image: reportportal/service-metrics-gatherer:5.11.0-r1
+    image: reportportal/service-metrics-gatherer:5.12.0-r1
     container_name: reportportal-metrics-gatherer
     logging:
       <<: *logging
@@ -428,7 +428,7 @@ services:
     restart: always
 
   migrations:
-    image: reportportal/migrations:5.11.0
+    image: reportportal/migrations:5.12.0
     container_name: reportportal-migrations
     logging:
       <<: *logging

gradle.properties

@@ -1,4 +1,4 @@
-version=5.11.4
+version=5.12.1
 description=Unified Authorization Trap for all ReportPortal's Services
 dockerPrepareEnvironment=
 dockerJavaOpts=-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom

project-properties.gradle

@@ -4,7 +4,7 @@ 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.11.0' : 'develop')
+    scriptsUrl = commonScriptsUrl + (releaseMode ? '5.12.0' : 'develop')
     isDebugMode = System.getProperty("DEBUG", "false") == "true"
 }