From aa008a4b6f456b235229a2a4d865ecdfb918e835 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Wed, 4 Sep 2024 14:45:58 +0300
Subject: [PATCH 1/4] Release 5.12.0
---
.github/workflows/release.yml | 2 +-
build.gradle | 6 +++---
docker-compose.yml | 14 +++++++-------
gradle.properties | 2 +-
project-properties.gradle | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 915170cd..3e7ff1b2 100644
--- a/.github/workflows/release.yml
+++ b/.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:
diff --git a/build.gradle b/build.gradle
index 2f1b966b..4eb61f1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ ext['log4j2.version'] = '2.21.1'
dependencyManagement {
imports {
- mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + '5.11.7' : 'com.epam.reportportal:commons-bom:5.11.7')
+ mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + '5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
}
}
@@ -43,8 +43,8 @@ dependencies {
api 'com.epam.reportportal:commons-dao'
api 'com.epam.reportportal:commons'
} else {
- api 'com.github.reportportal:commons-dao:4f0bff6'
- api 'com.github.reportportal:commons:50a1192'
+ api 'com.github.reportportal:commons-dao:acf1ec7'
+ api 'com.github.reportportal:commons:c8ef09c'
}
//Fix CVE-2021-41079, CVE-2022-23181, CVE-2021-33037, CVE-2021-30640, CVE-2022-42252, CVE-2023-46589, CVE-2024-24549
diff --git a/docker-compose.yml b/docker-compose.yml
index 9fc028aa..ee970b3b 100644
--- a/docker-compose.yml
+++ b/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
diff --git a/gradle.properties b/gradle.properties
index a8ab2baa..6623cbbe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.11.4
+version=5.12.0
description=Unified Authorization Trap for all ReportPortal's Services
dockerPrepareEnvironment=
dockerJavaOpts=-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom
diff --git a/project-properties.gradle b/project-properties.gradle
index d2a0100a..fc3b06fe 100755
--- a/project-properties.gradle
+++ b/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"
}
From 168a2d91cc7f75b5fcbaac0ac4544deaa020b97f Mon Sep 17 00:00:00 2001
From: Reingold Shekhtel <13565058+raikbitters@users.noreply.github.com>
Date: Thu, 19 Sep 2024 13:40:26 +0200
Subject: [PATCH 2/4] Update Dockerfile
---
Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 7a9d4b15..690a3319 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,7 @@ RUN if [ "${RELEASE_MODE}" = true ]; then \
-Dorg.gradle.project.version=${APP_VERSION}; \
else gradle build --no-build-cache --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
-# For ARM build use flag: `--platform linux/arm64`
-FROM --platform=$BUILDPLATFORM amazoncorretto:21.0.4
+FROM amazoncorretto:21.0.4
LABEL version=${APP_VERSION} description="EPAM ReportPortal. Auth Service" maintainer="Andrei Varabyeu <andrei_varabyeu@epam.com>, Hleb Kanonik <hleb_kanonik@epam.com>"
ARG APP_VERSION=${APP_VERSION}
ENV APP_DIR=/usr/app
From c448d2de2aad89790a922a0d43643514b285e637 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Thu, 19 Sep 2024 15:50:28 +0300
Subject: [PATCH 3/4] Use jdk 21 in release workflow
---
.github/workflows/manually-release.yml | 6 +++---
.github/workflows/release.yml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/manually-release.yml b/.github/workflows/manually-release.yml
index d8c2ec26..34580f24 100644
--- a/.github/workflows/manually-release.yml
+++ b/.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'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3e7ff1b2..d4ba69ac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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'
From c56a3218f2d775f1f881060c86d10f4a014f745d Mon Sep 17 00:00:00 2001
From: "reportportal.io" <support@reportportal.io>
Date: Thu, 19 Sep 2024 12:54:29 +0000
Subject: [PATCH 4/4] [Gradle Release Plugin] - new version commit: '5.12.1'.
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 6623cbbe..9ad71799 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.12.0
+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