Skip to content

Upgrade to JDK25 and gradle 9.2.0 #901

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.

Sign up for GitHub

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

Draft
AjayRajNelapudi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Upgrade to JDK25 and gradle 9.2.0 #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
matrix:
java:
- 21
- 24
- 25
fail-fast: false
runs-on: [ubuntu-latest]
name: Building PA package
Expand Down Expand Up @@ -69,3 +69,4 @@ jobs:
#- name: Run PerformanceAnalzyer Backwards Compatibility Tests
# working-directory: ./tmp/performance-analyzer
# run: ./gradlew bwcTestSuite -Dtests.security.manager=false

2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 21
java-version: 25
- uses: actions/checkout@v3

- name: Load secret
Expand Down
63 changes: 34 additions & 29 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ buildscript {
// Used to resolve build file dependencies
repositories {
mavenLocal()
maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" }
maven { url = "https://ci.opensearch.org/ci/dbc/snapshots/maven/" }
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
maven { url = "https://plugins.gradle.org/m2/" }
}

dependencies {
Expand All @@ -59,7 +59,7 @@ plugins {

checkstyle {
toolVersion = '11.0.0'
configFile file("checkstyle/checkstyle.xml")
configFile = file("checkstyle/checkstyle.xml")
}

spotbugsMain {
Expand Down Expand Up @@ -106,7 +106,7 @@ noticeFile = rootProject.file('NOTICE.txt')
spotless {
java {
licenseHeaderFile(file('license-header'))
googleJavaFormat('1.17.0').aosp()
googleJavaFormat('1.32.0').aosp()
importOrder()
removeUnusedImports()
trimTrailingWhitespace()
Expand Down Expand Up @@ -135,13 +135,18 @@ loggerUsageCheck.enabled = false
def _numNodes = findProperty('numNodes') as Integer ?: 1

opensearchplugin {
name 'opensearch-performance-analyzer'
description 'OpenSearch Performance Analyzer Plugin'
classname 'org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin'
name = 'opensearch-performance-analyzer'
description = 'OpenSearch Performance Analyzer Plugin'
classname = 'org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin'
}

sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
def javaVersion = JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_25) ?
JavaVersion.VERSION_25 : JavaVersion.VERSION_24

java {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}

compileJava {
dependsOn spotlessApply
Expand All @@ -151,7 +156,7 @@ javadoc {
}

project.afterEvaluate {
JavaVersion targetVersion = JavaVersion.toVersion(targetCompatibility)
JavaVersion targetVersion = JavaVersion.toVersion(project.java.targetCompatibility)

// cannot contain the first version
// should be '8' or '11' etc.
Expand All @@ -161,6 +166,7 @@ project.afterEvaluate {
}

compileJava.options.compilerArgs.removeAll(['--release', version])
compileJava.options.release = version.toInteger()
}

publishing {
Expand Down Expand Up @@ -215,7 +221,7 @@ tasks.withType(JavaCompile) {
}

jacoco {
toolVersion = "0.8.12"
toolVersion = "0.8.14"
}

jacocoTestReport {
Expand Down Expand Up @@ -286,19 +292,21 @@ dependencies {
}

configurations.all {
resolutionStrategy {
force "junit:junit:${junitVersion}"
force "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
force "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
force "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
force "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}"
force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}"
force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
force "org.apache.commons:commons-lang3:${versions.commonslang}"
force "org.slf4j:slf4j-api:2.0.0"
force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4
force "com.google.guava:guava:${guavaVersion}"
incoming.beforeResolve {
resolutionStrategy {
force "junit:junit:${junitVersion}"
force "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
force "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
force "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
force "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}"
force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}"
force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
force "org.apache.commons:commons-lang3:${versions.commonslang}"
force "org.slf4j:slf4j-api:2.0.0"
force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4
force "com.google.guava:guava:${guavaVersion}"
}
}
}

Expand Down Expand Up @@ -440,10 +448,7 @@ dependencyLicenses {

dependencyLicenses.doFirst {
def licenseDir = "$projectDir/licenses"
exec {
workingDir("$licenseDir")
commandLine 'rm', "-f", "performance-analyzer-commons-${paCommonsVersion}.jar.sha1"
}
delete "${licenseDir}/performance-analyzer-commons-${paCommonsVersion}.jar.sha1"
updateShas.updateShas()
}

Expand Down Expand Up @@ -724,7 +729,7 @@ afterEvaluate {
version = "${project.version}"

into '/usr/share/opensearch/plugins'
from(zipTree(bundlePlugin.archivePath)) {
from(zipTree(bundlePlugin.archiveFile)) {
into opensearchplugin.name
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading