EPMRPP-84831 || Update Gradle build scrip

reportportal · Jan 31, 2024 · 07a43d6 · 07a43d6
1 parent e6db1fc
commit 07a43d6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 106 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM gradle:8.4.0-jdk21 AS build
+FROM --platform=$BUILDPLATFORM gradle:8.5.0-jdk21 AS build
 ARG RELEASE_MODE
 ARG APP_VERSION
 WORKDIR /usr/app

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/Jenkinsfile-candidate b/Jenkinsfile-candidate
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.springframework.boot' version '2.7.17'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
 }
 
@@ -11,9 +11,8 @@ project.ext {
 
 ext['junit-jupiter.version'] = '5.10.0'
 
-def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.10.0' : 'EPMRPP-85756')
+def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.10.0' : 'develop')
 
-apply from: "$scriptsUrl/build-docker.gradle"
 apply from: "$scriptsUrl/build-commons.gradle"
 apply from: "$scriptsUrl/build-info.gradle"
 //apply from: "$scriptsUrl/build-quality.gradle"
@@ -26,7 +25,7 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '8.5'
 }
 
 bootJar {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME