Skip to content

Commit

Permalink
Merge pull request #1921 from reportportal/EPMRPP-84831
Browse files Browse the repository at this point in the history
EPMRPP-84831 || Update Gradle build script
APiankouski authored Feb 1, 2024
2 parents 8a05252 + b0ae9ce commit 0989a97
Showing 8 changed files with 7 additions and 149 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
44 changes: 0 additions & 44 deletions Jenkinsfile

This file was deleted.

57 changes: 0 additions & 57 deletions Jenkinsfile-candidate

This file was deleted.

42 changes: 0 additions & 42 deletions Jenkinsfile-release

This file was deleted.

3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -18,13 +18,12 @@ plugins {
id "io.spring.dependency-management" version "1.1.4"
id 'org.springframework.boot' version '2.5.15'
id 'java'
id "org.owasp.dependencycheck" version "8.2.1"
id "org.owasp.dependencycheck" version "9.0.9"
}

import org.owasp.dependencycheck.reporting.ReportGenerator

apply from: 'project-properties.gradle'
apply from: "$scriptsUrl/build-docker.gradle"
apply from: "$scriptsUrl/build-commons.gradle"
apply from: "$scriptsUrl/build-info.gradle"
apply from: "$scriptsUrl/release-service.gradle"
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
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
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions project-properties.gradle
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ project.ext {
isDebugMode = System.getProperty("DEBUG", "false") == "true"
releaseMode = project.hasProperty("releaseMode")
scriptsUrl = commonScriptsUrl + (releaseMode ? '5.10.0' : 'develop')
migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.10.0' : 'feature/settings')
migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.10.0' : 'develop')
//TODO refactor with archive download
testScriptsSrc = [
(migrationsUrl + '/migrations/0_extensions.up.sql') : 'V001__extensions.sql',
@@ -83,5 +83,5 @@ project.ext {
}

wrapper {
gradleVersion = '8.4'
gradleVersion = '8.5'
}

0 comments on commit 0989a97

Please sign in to comment.