Skip to content

Migrate corfudb-cloud to JDK 25 #283

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

Merged
chetangudisagar merged 1 commit into from
Mar 13, 2026
Merged

Migrate corfudb-cloud to JDK 25 #283

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
2 changes: 1 addition & 1 deletion .github/workflows/publish-universe-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '21'
java-version: '25'
check-latest: true
cache-dependency-path: '**/pom.xml'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '21'
java-version: '25'
check-latest: true
cache-dependency-path: '**/pom.xml'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_universe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '21'
java-version: '25'
check-latest: true
cache-dependency-path: '**/pom.xml'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '21'
java-version: '25'
check-latest: true
cache-dependency-path: '**/pom.xml'

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:21-bullseye
FROM eclipse-temurin:25-jdk-noble

RUN apt-get update && apt-get install -y iputils-ping

Expand Down
4 changes: 2 additions & 2 deletions benchmarks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ buildscript {
plugins {
java
idea
id("com.google.protobuf") version "0.9.3"
id("com.google.protobuf") version "0.9.6"
id("com.google.osdetector") version "1.6.2"
id("io.freefair.lombok") version "8.12.1"
id("io.freefair.lombok") version "9.2.0"
id("checkstyle")
id("jacoco")
id("maven-publish")
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Jan 23 21:33:25 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 1 addition & 1 deletion cloud/corfu/corfu-client-example/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:21-bullseye
FROM eclipse-temurin:25-jdk-noble

ADD ./build/libs/corfu-runtime-client-example.jar /app/

Expand Down
2 changes: 1 addition & 1 deletion cloud/corfu/corfu-client-example/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Jan 23 21:33:25 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 1 addition & 1 deletion cloud/infrastructure/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Jan 23 21:33:25 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 1 addition & 1 deletion cloud/infrastructure/integration-tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:21-bullseye
FROM eclipse-temurin:25-jdk-noble

RUN apt update \
&& apt install -y ca-certificates curl \
Expand Down
2 changes: 1 addition & 1 deletion cloud/infrastructure/integration-tools/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.nio.charset.StandardCharsets

plugins {
kotlin("jvm") version "1.3.71"
id("com.palantir.docker") version "0.36.0"
id("com.palantir.docker") version "0.37.0"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion cloud/infrastructure/kibana/kibana-tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:21-bullseye
FROM eclipse-temurin:25-jdk-noble

ADD ./lib /app/lib/
ADD ./*.jar /app/
Expand Down
2 changes: 1 addition & 1 deletion cloud/infrastructure/kibana/kibana-tools/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import java.nio.charset.StandardCharsets
plugins {
kotlin("jvm") version "1.3.71"
kotlin("plugin.serialization") version "1.3.71"
id("com.palantir.docker") version "0.36.0"
id("com.palantir.docker") version "0.37.0"
}

val gradleScriptsDir: String = project.rootDir.parentFile.parent
Expand Down
8 changes: 4 additions & 4 deletions gradle/idea.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import groovy.xml.XmlUtil
import groovy.xml.XmlParser
import groovy.namespace.QName
import java.nio.file.Paths
import java.io.File
import groovy.util.XmlParser
import groovy.xml.*

idea {
module {
inheritOutputDirs = false
outputDir = compileJava.destinationDir
testOutputDir = compileTestJava.destinationDir
outputDir = compileJava.destinationDirectory.asFile.get()
testOutputDir = compileTestJava.destinationDirectory.asFile.get()
}
}

Expand Down
15 changes: 12 additions & 3 deletions gradle/java.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
group = 'org.corfudb'

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25

withJavadocJar()
withSourcesJar()
Expand All @@ -13,6 +13,7 @@ dependencies {

testImplementation "org.assertj:assertj-core:${assertjVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.5.2"
}

/**
Expand All @@ -22,7 +23,15 @@ dependencies {
*/
test {
maxHeapSize("4096m")
jvmArgs("--add-opens=java.base/java.net=ALL-UNNAMED")
jvmArgs(
"--add-opens=java.base/java.net=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.io=ALL-UNNAMED",
"--add-opens=java.management/sun.management=ALL-UNNAMED",
"--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED"
)

useJUnitPlatform {
def tags = System.getProperty('tags', '')
Expand Down
4 changes: 2 additions & 2 deletions gradle/universe.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
task deployment(type: JavaExec) {
group = 'corfu'

main = 'org.corfudb.universe.test.management.Deployment'
mainClass.set('org.corfudb.universe.test.management.Deployment')
classpath = sourceSets.main.runtimeClasspath
}

task shutdown(type: JavaExec) {
group = 'corfu'

main = 'org.corfudb.universe.test.management.Shutdown'
mainClass.set('org.corfudb.universe.test.management.Shutdown')
classpath = sourceSets.main.runtimeClasspath
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Jan 23 21:33:25 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:21-bullseye
FROM eclipse-temurin:25-jdk-noble

ADD ./ /universe-tests
WORKDIR /universe-tests/tests
Expand Down
6 changes: 3 additions & 3 deletions tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ buildscript {
plugins {
java
idea
id("com.google.protobuf") version "0.9.3"
id("com.google.protobuf") version "0.9.6"
id("com.google.osdetector") version "1.6.2"
id("io.freefair.lombok") version "8.12.1"
id("io.freefair.lombok") version "9.2.0"
id("checkstyle")
id("jacoco")
id("com.palantir.docker") version "0.36.0"
id("com.palantir.docker") version "0.37.0"
}

val gradleScriptsDir: String = project.rootDir.parent
Expand Down
2 changes: 1 addition & 1 deletion tests/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Jan 23 21:33:25 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
14 changes: 14 additions & 0 deletions tests/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
}
resolutionStrategy {
eachPlugin {
if (requested.id.id == "com.palantir.docker") {
useModule("com.palantir.gradle.docker:gradle-docker:${requested.version}")
}
}
}
}

rootProject.name = "corfu-universe-tests"

includeBuild("../universe")
2 changes: 1 addition & 1 deletion universe/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Thu Jan 23 21:33:25 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 1 addition & 1 deletion universe/universe-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

plugins {
java
id("io.freefair.lombok") version "8.12.1"
id("io.freefair.lombok") version "9.2.0"
id("checkstyle")
id("jacoco")
id("maven-publish")
Expand Down
5 changes: 4 additions & 1 deletion ...verse-core/src/main/java/org/corfudb/universe/infrastructure/docker/universe/FakeDns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;

/**
* Fake DNS resolver which allows our tests to work well even though we use
* strange loopback IP addresses (127.x.y.z) with no corresponding reverse
Expand Down Expand Up @@ -49,7 +50,9 @@ public synchronized FakeDns addForwardResolution(String hostname, InetAddress ip
* Install the fake DNS resolver into the Java runtime.
*/
public synchronized FakeDns install() {
if (installed) return this;
if (installed) {
return this;
}
try {
installDns();
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion universe/universe-infrastructure/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

plugins {
java
id("io.freefair.lombok") version "8.12.1"
id("io.freefair.lombok") version "9.2.0"
id("checkstyle")
id("jacoco")
id("maven-publish")
Expand Down
Loading