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-93672 migrate to Spring Boot 3 #63

Open
wants to merge 10 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
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# Linux start script should use lf
/gradlew text eol=lf

# These are Windows script files and should use crlf
*.bat text eol=crlf

# Binary files should be left untouched
*.jar binary

6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ hs_err_pid*
.idea/
build/
.gradle/

# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build
33 changes: 21 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'io.spring.dependency-management' version '1.0.8.RELEASE'
id 'io.spring.dependency-management' version '1.1.6'
id 'java'
id 'java-library'
}
Expand All @@ -15,11 +15,7 @@ def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/

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

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
wrapper.gradleVersion('6.0')
//apply from: scriptsUrl + '/build-quality.gradle' // TODO: fix gradle scripts

repositories {
mavenCentral { url "https://repo1.maven.org/maven2" }
Expand All @@ -29,22 +25,35 @@ repositories {
}
}

ext['spring-boot.version'] = '3.3.4' // TODO: set spring-boot version in commons-bom

dependencyManagement {
imports {
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.11.7' : 'com.epam.reportportal:commons-bom:5.11.7')
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
}
}

dependencies {
if (releaseMode) {
compile 'com.epam.reportportal:commons'
compile 'com.epam.reportportal:commons-dao'
implementation 'com.epam.reportportal:commons'
implementation 'com.epam.reportportal:commons-dao'
} else {
implementation 'com.github.reportportal:commons-dao:develop-SNAPSHOT'
implementation 'com.github.reportportal:commons-dao:653ca3f'
api 'com.github.reportportal:commons:develop-SNAPSHOT'
}
api 'org.pf4j:pf4j:3.10.0'
implementation 'com.fasterxml.jackson:jackson-bom:2.18.0'
implementation 'com.fasterxml.jackson.core:jackson-databind'

api 'org.hibernate.validator:hibernate-validator:6.2.5.Final'

api 'org.pf4j:pf4j:3.12.1'
api 'org.pf4j:pf4j-update:2.3.0'

testCompile 'junit:junit'
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
version=5.11.2
description=EPAM Report portal. Plugin extension APIs
junitVersion=5.10.3
org.gradle.parallel=true
org.gradle.caching=true
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