Skip to content

Commit

Permalink
Merge pull request #125 from reportportal/EPMRPP-84831
Browse files Browse the repository at this point in the history
EPMRPP-84831 || Update Gradle build script
  • Loading branch information
APiankouski authored Feb 1, 2024
2 parents 23d778f + 07a43d6 commit 6b4a77c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 107 deletions.
4 changes: 2 additions & 2 deletions 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
Expand All @@ -10,7 +10,7 @@ RUN if [ "${RELEASE_MODE}" = true ]; then \
else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi

# For ARM build use flag: `--platform linux/arm64`
FROM --platform=$BUILDPLATFORM amazoncorretto:21.0.1
FROM amazoncorretto:21.0.1
LABEL version=${APP_VERSION} description="EPAM Report portal. Jobs Service" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
ARG APP_VERSION=${APP_VERSION}
ENV APP_DIR=/usr/app
Expand Down
43 changes: 0 additions & 43 deletions Jenkinsfile

This file was deleted.

57 changes: 0 additions & 57 deletions Jenkinsfile-candidate

This file was deleted.

7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}

Expand All @@ -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"
Expand All @@ -26,7 +25,7 @@ tasks.withType(JavaCompile).configureEach {
}

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

bootJar {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 6b4a77c

Please sign in to comment.