Update dependency management plugin version and improve property hand…

…ling in Gradle files
reportportal · Dec 19, 2024 · 49a5cff · 49a5cff
1 parent 8dcc514
commit 49a5cff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 import org.owasp.dependencycheck.reporting.ReportGenerator
 
 plugins {
-    id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+    id 'io.spring.dependency-management' version '1.1.6'
     id 'java'
     id 'java-library'
     id 'org.owasp.dependencycheck' version '11.1.0'

diff --git a/project-properties.gradle b/project-properties.gradle
@@ -4,10 +4,10 @@ def migrationsScriptsUrl = 'https://raw.githubusercontent.com/reportportal/migra
 project.ext {
     publishRepo = "https://maven.pkg.github.com/reportportal/commons-dao"
     dependencyRepos = ["commons", "commons-rules", "commons-model", "commons-bom"]
-    releaseMode = project.hasProperty("releaseMode")
+    releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false
     hasDBSchema = project.hasProperty("DB_SCHEMA_POSTGRES")
-    scriptsUrl = commonScriptsUrl + (releaseMode ? getProperty('scripts.version') : 'develop')
-    migrationsUrl = migrationsScriptsUrl + (releaseMode ? getProperty('migrations.version') : 'develop')
+    scriptsUrl = commonScriptsUrl + (project.hasProperty("scripts.version") ? project.scripts.version : 'develop')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.13.0' : 'develop')
 
     //TODO refactor with archive download
     testScriptsSrc = [
@@ -109,6 +109,6 @@ project.ext {
     ]
 }
 
-wrapper {
-    gradleVersion = '8.10'
-}
+//wrapper {
+//    gradleVersion = '8.10'
+//}