-
Notifications
You must be signed in to change notification settings - Fork 0
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
grabsefx
wants to merge
7
commits into
develop
Choose a base branch
from
EPMRPP-93073-JDK21
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+627
−1,002
Open
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
eecfc95
EPMRPP-93073 migrate to JDK21
grabsefx a1ef860
Merge branch 'refs/heads/develop' into EPMRPP-93073-JDK21
grabsefx aa5a5c9
EPMRPP-93073 support Spring Boot 3
grabsefx b997ee3
EPMRPP-93073 support Spring Boot 3
grabsefx 4ed74a1
EPMRPP-93073 support Spring Boot 3
grabsefx 6ee6185
Merge branch 'develop' into EPMRPP-93073-SpringBoot-3-support
grabsefx 6369bc5
EPMRPP-93073 dependency updates
grabsefx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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/' + | ||
|
@@ -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}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't want our users rely on jackson version specified by our library, since we want to be free changing it. Please revert to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. fixed |
||
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}" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't manage to find any single reference on Spring in the code. If don use this library only to include transient Swagger annotations, please remove it and include
swagger-annotations
directly.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed