Skip to content

Commit

Permalink
EPMRPP-97122 || Update to JDK 21 (#37)
Browse files Browse the repository at this point in the history
  • Loading branch information
APiankouski authored Nov 27, 2024
1 parent 2de02b8 commit c579773
Show file tree
Hide file tree
Showing 19 changed files with 234 additions and 863 deletions.
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 @@ -27,11 +27,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/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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,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
18 changes: 10 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id "io.spring.dependency-management" version "1.0.9.RELEASE"
id 'io.spring.dependency-management' version '1.1.6'
id 'java'
id 'java-library'
id "org.owasp.dependencycheck" version "5.3.1"
id 'org.owasp.dependencycheck' version '11.1.0'
}

project.ext {
Expand All @@ -18,8 +18,10 @@ 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
java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

repositories {
mavenCentral { url "https://repo1.maven.org/maven2" }
Expand All @@ -39,15 +41,15 @@ dependencies {
if (releaseMode) {
api 'com.epam.reportportal:commons-reporting:5.12.3'
} else {
api 'com.github.reportportal:commons-reporting:1eaa63a'
api 'com.github.reportportal:commons-reporting:299cfbd'
}
api 'org.springframework:spring-webmvc'
api 'org.springframework.security:spring-security-core'
api 'org.apache.tika:tika-core'

implementation "org.springdoc:springdoc-openapi-data-rest:${sprindocAnnotationsVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
implementation "javax.validation:validation-api:${validationApiVersion}"
api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
api "javax.validation:validation-api:${validationApiVersion}"
implementation "org.apache.commons:commons-lang3:${commonsLangVersion}"
implementation group: 'com.google.guava', name: 'guava', version: '28.2-jre'
implementation 'javax.servlet:javax.servlet-api'
Expand All @@ -72,7 +74,7 @@ dependencies {
}

wrapper {
gradleVersion = '8.5'
gradleVersion = '8.10'
}

tasks.preTagCommit.enabled = false
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version=5.12.3
description=EPAM Report portal common libs
hibernateValidatorVersion=6.1.2.Final
hibernateValidatorVersion=6.2.0.Final
validationApiVersion=2.0.1.Final
junitVersion=4.12
junitVersion=4.13.1
elApiVersion=3.0.0
sprindocAnnotationsVersion=1.7.0
commonsLangVersion=3.9
mockitoJunitJupiter=2.23.0
jacksonVersion=2.10.2
jacksonVersion=2.13.4.2
lombokVersion=1.18.30
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Mar 16 18:41:59 MSK 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit c579773

Please sign in to comment.