Skip to content

Commit 6732f78

Browse files
authored
Merge pull request #57 from reportportal/EPMRPP-111932-java-25
EPMRPP-111932 || Upgrade Java 21 → 25
1 parent a2c744c commit 6732f78

File tree

7 files changed

+131
-123
lines changed

7 files changed

+131
-123
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
- name: Checkout repository
2626
uses: actions/checkout@v5
2727

28-
- name: Set up JDK 21
28+
- name: Set up JDK 25
2929
uses: actions/setup-java@v4
3030
with:
3131
distribution: 'temurin'
32-
java-version: '21'
32+
java-version: '25'
3333

3434
- name: Grant execute permission for gradlew
3535
run: chmod +x gradlew

build.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ plugins {
22
id "io.spring.dependency-management" version "1.1.7"
33
id 'java'
44
id 'jacoco'
5+
id 'com.gradleup.shadow' version '9.3.1'
56
}
67

78
project.ext {
89
publishRepo = "https://maven.pkg.github.com/reportportal/plugin-bts-rally"
910
dependencyRepos = ["plugin-api", "commons-bom"]
1011
releaseMode = project.hasProperty("releaseMode")
1112
pluginID = "rally"
12-
pluginsDir = "$buildDir/plugins"
13+
pluginsDir = layout.buildDirectory.dir("plugins").get().asFile.path
1314
}
1415

1516
def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' +
@@ -20,15 +21,15 @@ apply from: scriptsUrl + '/signing.gradle'
2021

2122

2223
java {
23-
sourceCompatibility = JavaVersion.VERSION_21
24-
targetCompatibility = JavaVersion.VERSION_21
24+
sourceCompatibility = JavaVersion.VERSION_25
25+
targetCompatibility = JavaVersion.VERSION_25
2526
}
2627

2728
repositories {
28-
mavenCentral { url "https://repo1.maven.org/maven2" }
29+
mavenCentral { url = "https://repo1.maven.org/maven2" }
2930

3031
if (!releaseMode) {
31-
maven { url 'https://jitpack.io' }
32+
maven { url = 'https://jitpack.io' }
3233
}
3334
}
3435

@@ -40,19 +41,20 @@ dependencies {
4041
implementation 'com.epam.reportportal:service-api'
4142
annotationProcessor 'com.epam.reportportal:service-api'
4243
} else {
43-
implementation 'com.github.reportportal:service-api:3e34a90'
44-
annotationProcessor 'com.github.reportportal:service-api:3e34a90'
44+
implementation 'com.github.reportportal:service-api:7044a29'
45+
annotationProcessor 'com.github.reportportal:service-api:7044a29'
4546
}
4647

4748
implementation 'com.rallydev.rest:rally-rest-api:2.2.1'
4849

4950
testImplementation "org.junit.jupiter:junit-jupiter-params"
5051
testImplementation "org.junit.jupiter:junit-jupiter-api"
5152
testImplementation "org.junit.jupiter:junit-jupiter-engine"
53+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
5254
}
5355

5456
wrapper {
55-
gradleVersion = '8.10.2'
57+
gradleVersion = '9.3.1'
5658
}
5759

5860
generatePomFileForShadowPublication { pom.packaging = "jar" }
@@ -71,7 +73,7 @@ jar {
7173
}
7274

7375
shadowJar {
74-
zip64 true
76+
zip64 = true
7577
dependencies {
7678
include(dependency('com.rallydev.rest:rally-rest-api'))
7779
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ version=5.13.0
22
description=EPAM Report portal. Rally Integration Plugin
33
pluginId = rally
44
junitVersion=5.11.4
5-
springBootVersion=3.4.2
5+
springBootVersion=3.5.9

gradle/wrapper/gradle-wrapper.jar

-15.1 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 22 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)