Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/reportportal/commons-dao
Browse files Browse the repository at this point in the history
…into develop

# Conflicts:
#	gradle.properties
  • Loading branch information
pbortnik committed Dec 5, 2024
2 parents 527168b + acf1ec7 commit 1e6fe09
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ on:

env:
GH_USER_NAME: github.actor
SCRIPTS_VERSION: 5.11.0
BOM_VERSION: 5.11.7
MIGRATIONS_VERSION: 5.11.0
RELEASE_VERSION: 5.11.6
SCRIPTS_VERSION: 5.12.0
BOM_VERSION: 5.12.1
MIGRATIONS_VERSION: 5.12.0
RELEASE_VERSION: 5.12.1

jobs:
release:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ext['spring-boot.version'] = '2.5.15'

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')
mavenBom('io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0')
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=5.11.7
version=5.12.2
lombokVersion=1.18.30
jooqVersion=3.19.13

0 comments on commit 1e6fe09

Please sign in to comment.