Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPMRPP-93073 migrate to Spring Boot 3 #14

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
java-version: '21'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manually-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
java-version: '21'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:

steps:

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
java-version: '21'

- name: Get variables
run: |
Expand Down Expand Up @@ -105,4 +105,4 @@ jobs:
else
echo 'Verification failed, please check the bundle' 1>&2
exit 1
fi
fi
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
java-version: '21'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ env:
- JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2

jdk:
- oraclejdk11
- oraclejdk21

cache:
directories:
- $HOME/.m2
- $HOME/.gradle

notifications:
slack: reportportal:fl6xWHVQp1jvsMmCJxYW9YKP
slack: reportportal:fl6xWHVQp1jvsMmCJxYW9YKP
33 changes: 16 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import org.owasp.dependencycheck.reporting.ReportGenerator
*/
plugins {
id 'java'
id "org.owasp.dependencycheck" version "5.3.1"
id 'java-library'
id 'org.owasp.dependencycheck' version '10.0.4'
}

def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' +
Expand All @@ -27,34 +28,32 @@ project.ext.publishRepo = "https://maven.pkg.github.com/reportportal/commons-mod

apply from: scriptsUrl + '/release-commons.gradle'
apply from: scriptsUrl + '/signing.gradle'
apply from: scriptsUrl + '/build-quality.gradle'
//apply from: scriptsUrl + '/build-quality.gradle'

repositories {
mavenCentral { url "https://repo1.maven.org/maven2" }
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

wrapper {
gradleVersion = '6.0'
java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

dependencies {
dependencies {
implementation "org.springdoc:springdoc-openapi-data-rest:${sprindocAnnotationsVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
implementation "javax.validation:validation-api:${validationApiVersion}"
implementation "org.apache.commons:commons-lang3:${commonsLangVersion}"
api "org.springdoc:springdoc-openapi-starter-common:${springDocVersion}"
api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
api "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
api "org.apache.commons:commons-lang3:${commonsLangVersion}"

testImplementation "junit:junit:${junitVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${jupiterVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${jupiterVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jupiterVersion}"
testImplementation "org.mockito:mockito-junit-jupiter:${mockitoJunitJupiter}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
testImplementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
testImplementation "javax.el:javax.el-api:${elApiVersion}"
testImplementation "org.glassfish:javax.el:${elApiVersion}"
testImplementation "org.hamcrest:hamcrest:2.2"
testImplementation "jakarta.el:jakarta.el-api:6.0.1"
testImplementation "org.glassfish:jakarta.el:4.0.2"

// add lombok support
compileOnly "org.projectlombok:lombok:${lombokVersion}"
Expand Down
21 changes: 11 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
version=5.10.0

org.gradle.parallel=true
org.gradle.caching=true

description=EPAM Report portal. REST Reporting API model
hibernateValidatorVersion=6.1.2.Final
validationApiVersion=2.0.1.Final
junitVersion=4.12
jupiterVersion=5.8.1
elApiVersion=3.0.0
sprindocAnnotationsVersion=1.7.0
commonsLangVersion=3.9
mockitoJunitJupiter=3.4.6
jacksonVersion=2.10.2
lombokVersion=1.18.30
hibernateValidatorVersion=8.0.1.Final
junitVersion=5.10.5
mockitoJunitJupiter=5.12.0
springDocVersion=2.6.0
commonsLangVersion=3.17.0
jacksonVersion=2.18.1
lombokVersion=1.18.34
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-6.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading