Merge branch 'master' of https://github.com/reportportal/commons-dao …

…into develop # Conflicts: # build.gradle # gradle.properties
reportportal · Dec 11, 2024 · 8dcc514 · 8dcc514
2 parents 72f99ff + fb9b56a
commit 8dcc514
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,9 +12,9 @@ on:
 env:
   GH_USER_NAME: github.actor
   SCRIPTS_VERSION: 5.12.0
-  BOM_VERSION: 5.12.1
-  MIGRATIONS_VERSION: 5.12.0
-  RELEASE_VERSION: 5.12.1
+  BOM_VERSION: 5.13.0
+  MIGRATIONS_VERSION: 5.13.0
+  RELEASE_VERSION: 5.13.0
 
 jobs:
   release:

diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ ext['spring-boot.version'] = '2.5.15'
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.13.0' : 'com.epam.reportportal:commons-bom:5.13.0')
         mavenBom('io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0')
     }
 }
@@ -121,3 +121,7 @@ tasks.withType(JavaCompile) {
 checkCommitNeeded.dependsOn removeScripts
 test.dependsOn copyTestDatabaseScripts
 //build.dependsOn jacocoTestReport
+
+tasks.preTagCommit.enabled = false
+tasks.updateVersion.enabled = false
+tasks.commitNewVersion.enabled = false
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-version=5.12.2
+version=5.13.0
 lombokVersion=1.18.30
 jooqVersion=3.19.13