From c9bd2595edde40c6b17620372099bb9fefde58b5 Mon Sep 17 00:00:00 2001 From: Nikolay Antonov Date: Thu, 23 Apr 2026 08:45:22 +0500 Subject: [PATCH 1/7] Update gradle wrapper to 8.14.4 to support Java 21 --- .github/workflows/pxf-ci.yml | 2 +- .../src/main/resources/testcontainers/pxf-cbdb/Dockerfile | 2 +- server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256 | 1 - server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 | 1 + server/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256 create mode 100644 server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 diff --git a/.github/workflows/pxf-ci.yml b/.github/workflows/pxf-ci.yml index f029125ac..4a2abb7d1 100644 --- a/.github/workflows/pxf-ci.yml +++ b/.github/workflows/pxf-ci.yml @@ -218,7 +218,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '11', '17' ] + java: [ '8', '11', '17', '21' ] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile b/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile index 19ef014a2..81bcd629a 100644 --- a/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile +++ b/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile @@ -37,7 +37,7 @@ RUN if command -v apt-get >/dev/null 2>&1; then \ # Install Gradle and warm wrapper cache (it will download GRADLE_VERSION again) # (version must match server/gradle/wrapper/gradle-wrapper.properties) -ARG GRADLE_VERSION=7.6.6 +ARG GRADLE_VERSION=8.14.4 RUN curl -fsSL "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \ -o /tmp/gradle.zip && \ sudo unzip -q /tmp/gradle.zip -d /opt && \ diff --git a/server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256 b/server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256 deleted file mode 100644 index c957e1d4e..000000000 --- a/server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256 +++ /dev/null @@ -1 +0,0 @@ -14dfa961b6704bb3decdea06502781edaa796a82e6da41cd2e1962b14fbe21a3 \ No newline at end of file diff --git a/server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 b/server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 new file mode 100644 index 000000000..7af19faad --- /dev/null +++ b/server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 @@ -0,0 +1 @@ +f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d \ No newline at end of file diff --git a/server/gradle/wrapper/gradle-wrapper.properties b/server/gradle/wrapper/gradle-wrapper.properties index 92df30b1b..c6d33a6a2 100644 --- a/server/gradle/wrapper/gradle-wrapper.properties +++ b/server/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 6b023d8df25eaa9c29c966f3571a394cf715073b Mon Sep 17 00:00:00 2001 From: Nikolay Antonov Date: Thu, 23 Apr 2026 08:50:02 +0500 Subject: [PATCH 2/7] use wrapper checksum, not gradle --- server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 b/server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 index 7af19faad..30bde90fc 100644 --- a/server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 +++ b/server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 @@ -1 +1 @@ -f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d \ No newline at end of file +7d3a4ac4de1c32b59bc6a4eb8ecb8e612ccd0cf1ae1e99f66902da64df296172 \ No newline at end of file From d9185808f173a2f10735c2ceee3f50d2bf05e106 Mon Sep 17 00:00:00 2001 From: Nikolay Antonov Date: Thu, 23 Apr 2026 08:56:53 +0500 Subject: [PATCH 3/7] update gradle SHA as well --- server/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/gradle/wrapper/gradle-wrapper.properties b/server/gradle/wrapper/gradle-wrapper.properties index c6d33a6a2..537d07dc3 100644 --- a/server/gradle/wrapper/gradle-wrapper.properties +++ b/server/gradle/wrapper/gradle-wrapper.properties @@ -4,4 +4,4 @@ distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=673d9776f303bc7048fc3329d232d6ebf1051b07893bd9d11616fad9a8673be0 +distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d From 1d5eea73bdc0354e7e9a63f272bc31a1f34e227b Mon Sep 17 00:00:00 2001 From: Nikolay Antonov Date: Thu, 23 Apr 2026 08:58:19 +0500 Subject: [PATCH 4/7] rat --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4863ada78..aa835e8b8 100644 --- a/pom.xml +++ b/pom.xml @@ -1369,7 +1369,7 @@ --> .github/pull_request_template.md - server/gradle/wrapper/gradle-7.6.6-wrapper.jar.sha256 + server/gradle/wrapper/gradle-8.14.4-wrapper.jar.sha256 From 216d13fbda75959be9e37f365bbedc0015bcbbeb Mon Sep 17 00:00:00 2001 From: Nikolay Antonov Date: Thu, 23 Apr 2026 09:07:39 +0500 Subject: [PATCH 5/7] run 'gradle init' in empty dir --- .../src/main/resources/testcontainers/pxf-cbdb/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile b/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile index 81bcd629a..f8d4eb4f2 100644 --- a/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile +++ b/automation/src/main/resources/testcontainers/pxf-cbdb/Dockerfile @@ -43,8 +43,9 @@ RUN curl -fsSL "https://services.gradle.org/distributions/gradle-${GRADLE_VERSIO sudo unzip -q /tmp/gradle.zip -d /opt && \ sudo ln -s "/opt/gradle-${GRADLE_VERSION}/bin/gradle" /usr/local/bin/gradle && \ rm /tmp/gradle.zip && \ - cd /tmp && gradle init && gradle wrapper --gradle-version ${GRADLE_VERSION} && ./gradlew javaToolchains &&\ - rm -rf /tmp/gradle /tmp/gradlew /tmp/gradlew.bat /tmp/.gradle + mkdir -p /tmp/gradle-wrapper-warm && cd /tmp/gradle-wrapper-warm && \ + gradle init && gradle wrapper --gradle-version ${GRADLE_VERSION} && ./gradlew javaToolchains && \ + cd / && rm -rf /tmp/gradle-wrapper-warm ENV GRADLE_HOME="/opt/gradle-${GRADLE_VERSION}" # Go toolchain for building pxf_regress inside the container From 70f2cf7e5382a5b343e808f54cf85591facd84f7 Mon Sep 17 00:00:00 2001 From: Nikolay Antonov Date: Thu, 23 Apr 2026 10:52:51 +0500 Subject: [PATCH 6/7] bump lombok to support java 21 --- server/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build.gradle b/server/build.gradle index dfc9772d6..f8675182d 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -24,7 +24,7 @@ buildscript { } plugins { - id "io.freefair.lombok" version "6.6.3" + id "io.freefair.lombok" version "8.14.4" id "org.springframework.boot" version "${springBootVersion}" apply false id 'io.spring.dependency-management' version '1.0.15.RELEASE' } From 0bf1a1bd2f015e3e900118333e8858877fca958b Mon Sep 17 00:00:00 2001 From: Nikolay Antonov Date: Thu, 23 Apr 2026 11:26:52 +0500 Subject: [PATCH 7/7] bump mockito version to support Java 21 --- server/build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/build.gradle b/server/build.gradle index f8675182d..d3ab87adb 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -242,6 +242,15 @@ configure(javaProjects) { exclude("org.junit.jupiter:junit-jupiter-api") } + // JAVA 21 support + dependencySet(group:"org.mockito", version:"4.11.0") { + entry("mockito-core") + entry("mockito-inline") + } + dependencySet(group:"net.bytebuddy", version:"1.14.19") { + entry("byte-buddy") + entry("byte-buddy-agent") + } } }