Conversation
karianna
commented
Jan 30, 2026
- Bump gradle-wrapper from 8.14.3 to 9.3.0 in /linux
- Fix Gradle 9.3.0 compatibility in debian JDK packaging task (Fix Gradle 9.3.0 compatibility in debian JDK packaging task #1327)
- Fix Gradle 9.3.0 compatibility: use exec() instead of project.exec() in doLast blocks (Fix Gradle 9.3.0 compatibility: use exec() instead of project.exec() in doLast blocks #1333)
- Update linux folder gradle files to have 9.3.0 support
|
@steelhead31 OK, I actually spent proper time with Copilot in my IDE and got this to work. |
Bumps gradle-wrapper from 8.14.3 to 9.3.0. --- updated-dependencies: - dependency-name: gradle-wrapper dependency-version: 9.3.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…#1327) * Initial plan * Fix indentation in linux/jdk/debian/build.gradle for Gradle 9.3.0 compatibility Co-authored-by: karianna <180840+karianna@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: karianna <180840+karianna@users.noreply.github.com>
…in doLast blocks (adoptium#1333) * Initial plan * Fix Gradle 9.3.0 compatibility by replacing project.exec with exec in doLast blocks Co-authored-by: karianna <180840+karianna@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: karianna <180840+karianna@users.noreply.github.com>
23feb48 to
155aaf9
Compare
There was a problem hiding this comment.
Pull request overview
Updates the linux/ Gradle wrapper to 9.3.0 and adjusts Linux packaging Gradle builds to work under Gradle 9.x (notably around exec usage in task actions and JUnit runtime dependencies for package tests).
Changes:
- Bump Gradle wrapper to 9.3.0 (
gradle-wrapper.properties,gradle-wrapper.jar,gradlew,gradlew.bat). - Update multiple Linux packaging
build.gradlefiles to use a newExecHelperwrapper forexeccalls and addjunit-platform-launcherto package test runtime. - Replace some
project.copy {}usages withcopy {}in Debian scripts.
Reviewed changes
Copilot reviewed 12 out of 13 changed files in this pull request and generated 19 comments.
Show a summary per file
| File | Description |
|---|---|
| linux/gradle/wrapper/gradle-wrapper.properties | Points wrapper distribution URL to Gradle 9.3.0. |
| linux/gradle/wrapper/gradle-wrapper.jar | Updates the wrapper JAR to the 9.3.0-compatible version. |
| linux/gradlew | Updates Unix wrapper script for Gradle 9.x (switches to -jar, other template changes). |
| linux/gradlew.bat | Updates Windows wrapper script for Gradle 9.x (switches to -jar, stderr routing). |
| linux/jdk/debian/build.gradle | Adds ExecHelper and updates exec/copy usage; adds JUnit platform launcher runtime dep. |
| linux/jdk/alpine/build.gradle | Adds ExecHelper; updates exec usage; adds JUnit platform launcher runtime dep. |
| linux/jdk/redhat/build.gradle | Adds ExecHelper; updates exec usage; adds JUnit platform launcher runtime dep. |
| linux/jdk/suse/build.gradle | Adds ExecHelper; updates exec usage; adds JUnit platform launcher runtime dep. |
| linux/jre/debian/build.gradle | Adds ExecHelper; updates exec/copy usage; adds JUnit platform launcher runtime dep. |
| linux/jre/alpine/build.gradle | Adds ExecHelper; updates exec usage; adds JUnit platform launcher runtime dep. |
| linux/jre/redhat/build.gradle | Adds ExecHelper; updates exec usage; adds JUnit platform launcher runtime dep. |
| linux/jre/suse/build.gradle | Adds ExecHelper; updates exec usage; adds JUnit platform launcher runtime dep. |
| linux/ca-certificates/debian/build.gradle | Adds ExecHelper; updates exec/copy usage; adds JUnit platform launcher runtime dep. |
Comments suppressed due to low confidence (1)
linux/jdk/debian/build.gradle:93
- The PR description says the Gradle 9.3 compatibility fix is to use
exec {}instead ofproject.exec {}insidedoLastblocks, but this file introducesExecHelperand callsexecHelper.exec {}instead. Consider switching toexec {}directly (or updating the PR description) to avoid confusion and keep the change aligned with the stated approach.
// Create ExecHelper instance for Gradle 9.x compatible exec operations
def execHelper = objects.newInstance(ExecHelper)
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @@ -118,7 +135,7 @@ task packageJreDebian { | |||
| } | |||
There was a problem hiding this comment.
The indentation in these if blocks is inconsistent (extra indentation on the execHelper.exec blocks and misaligned commandLine arguments), which makes it harder to verify what runs under each condition. Reformatting this section to a consistent indentation level would improve readability and reduce the chance of future brace/closure mistakes.
See below for a potential fix:
execHelper.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"--build-arg", "IMAGE=arm32v7/debian:bullseye",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
}
}
if ("$arch" == "riscv64") {
execHelper.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
}
}
steelhead31
left a comment
There was a problem hiding this comment.
This looks good, I'll use this as a base for bumping gradle in the linux_new / jenkins automation processes also.