feat: detect project's openjdk version by vpa1977 · Pull Request #169 · rockcrafters/java-rockcraft-plugins

vpa1977 · 2025-12-01T02:28:06Z

Changes:

update maven project to use build JDK 21 and use --release 8
Add Toolchain helpers to read Maven and Gradle toolchain settings. If not configured, use current Java. Default to OpenJDK 21 if OpenJDK supported by chisel is not found (8,11,17 and 21).
Add unit and integration tests.
Have you signed the CLA?

Toolchain.getToolchainVersion will return the toolchain configuration for the current project. If the toolchain settings can not be read, it will return openjdk-21.

- add final modifier - remove unused imports

- we lack openjdk-25 slices in the official release.

Copilot

Pull request overview

This PR adds automatic detection of the project's OpenJDK version from the configured Java toolchain. Instead of defaulting to openjdk-21-jdk, the build tools now inspect the Maven/Gradle toolchain configuration to determine the appropriate JDK package.

Key changes:

Introduced ToolchainHelper utility to parse javac -version output and map versions to OpenJDK packages
Added toolchain detection in both Maven and Gradle plugins via new Toolchain classes
Modified default buildPackage from hardcoded openjdk-21-jdk to empty string, triggering automatic detection
Added comprehensive test coverage for toolchain version detection (Java 8, 11, 17)

Reviewed changes

Copilot reviewed 22 out of 22 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
ToolchainHelper.java	Core utility for detecting JDK version from javac executable
Toolchain.java (maven)	Maven-specific toolchain detection using ToolchainManager
Toolchain.java (gradle)	Gradle-specific toolchain detection using JavaToolchainService
CommonRockcraftOptions.java	Changed default buildPackage from "openjdk-21-jdk" to ""
BuildRockcraftOptions.java	Removed hardcoded openjdk-21-jdk-headless default
CreateBuildRockMojo.java	Added toolchain detection when buildPackage is empty
AbstractRockMojo.java	Added toolchain detection when buildPackage is empty
CreateRockcraftTask.java	Added toolchain detection when buildPackage is empty
CreateBuildRockcraftTask.java	Added toolchain detection and JavaToolchainService injection
AbstractRockcraftTask.java	Changed to abstract class with JavaToolchainService injection
BuildRockcraftTask.java	Changed to abstract class for toolchain service injection
PushRockcraftTask.java	Changed to abstract class for toolchain service injection
ToolchainTest.java	Unit tests for Maven toolchain detection logic
CreateBuildRockTest.java	Integration test for Gradle toolchain detection
RawRunimePartTest.java	Updated test to set buildPackage explicitly
pom.xml	Updated Mockito version and added mockito-core/junit-jupiter dependencies
toolchain-test/*	Integration test resources for Maven toolchain verification
toolchain-options.in	Test fixture for Gradle toolchain configuration

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

rockcraft/src/test/java/com/canonical/rockcraft/builder/RawRuntimePartTest.java

rockcraft/src/main/java/com/canonical/rockcraft/util/ToolchainHelper.java

rockcraft-maven/src/it/toolchain-test/verify.bsh

rockcraft-gradle/src/main/java/com/canonical/rockcraft/gradle/Toolchain.java

rockcraft-maven/pom.xml

Mockito 5.x requires 11+. Use --release 8 in the pom.xml to produce Java 8 compatible classes. Use Java 21 for building.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>

Toolchain unit tests try to run Java 8 and Java 11 javac.

Copilot

Pull request overview

Copilot reviewed 25 out of 25 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

rockcraft/src/main/java/com/canonical/rockcraft/util/ToolchainHelper.java

rockcraft-gradle/src/main/java/com/canonical/rockcraft/gradle/PushRockcraftTask.java

rockcraft-gradle/src/main/java/com/canonical/rockcraft/gradle/BuildRockcraftTask.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>

Pulled toolchain service down since only Create(Build)Rock tasks need it.

- specify openjdk discovery configuration - require openjdk range

rockcraft-gradle/src/main/java/com/canonical/rockcraft/gradle/AbstractRockcraftTask.java

# Conflicts: # .github/workflows/build.yml

vpa1977 added 11 commits December 1, 2025 14:25

chore(refactor): add toolchain methods

55ff87a

Toolchain.getToolchainVersion will return the toolchain configuration for the current project. If the toolchain settings can not be read, it will return openjdk-21.

feat: implement toolchain detection for maven

2c17899

feat: extract common helper for openjdk detected

77658ca

feat(gradle): add gradle openjdk detection

91050b7

fix(lint): fix linter warnings

22d0bee

- add final modifier - remove unused imports

test(gradle): add build rock test

4e9ad18

fix: do not set default build package

b08943a

fix: remove openjdk-25 from supported list

8c245ba

- we lack openjdk-25 slices in the official release.

feat(maven): detect current javac

afd5c53

test: add maven toolchain integration test

02bdaa6

fix(lint): drop spurious whitespace changes

09d71a7

vpa1977 self-assigned this Dec 1, 2025

vpa1977 requested a review from Copilot December 1, 2025 02:28

Copilot AI reviewed Dec 1, 2025

View reviewed changes

vpa1977 and others added 8 commits December 1, 2025 15:36

test: add openjdk-8 to the pipeline

b1eb8fb

fix: use Java 21 to build maven plugin

b192456

Mockito 5.x requires 11+. Use --release 8 in the pom.xml to produce Java 8 compatible classes. Use Java 21 for building.

fix: change modifier order final-static

c75b9a8

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>

fix: change modifier order final-static

5b0b59f

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>

fix(lint): rename Maven -> Gradle in plugin messages

f69ce30

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>

fix: use property for mockito version

ed15932

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>

chore: rename test (fix spelling)

70603ed

fix: install additional openjdk packages

e1c1976

Toolchain unit tests try to run Java 8 and Java 11 javac.

vpa1977 requested a review from Copilot December 1, 2025 03:10

Copilot AI reviewed Dec 1, 2025

View reviewed changes

vpa1977 and others added 6 commits December 1, 2025 16:12

fix(lint): missing space in return statement

80282be

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com>

fix(lint): pull toolchain service down

11dcb04

Pulled toolchain service down since only Create(Build)Rock tasks need it.

fix: use jdk-headless as default

f5c6b0d

fix: use -headless jdk slices

fd9da73

test: assert -headless packages

1b6cb3f

fix(test): fix maven invoker test

b21a612

- specify openjdk discovery configuration - require openjdk range

vpa1977 requested a review from pushkarnk December 1, 2025 08:49

pushkarnk reviewed Dec 2, 2025

View reviewed changes

rockcraft-gradle/src/main/java/com/canonical/rockcraft/gradle/AbstractRockcraftTask.java Outdated Show resolved Hide resolved

pushkarnk approved these changes Dec 2, 2025

View reviewed changes

vpa1977 added 3 commits December 3, 2025 08:30

fix(lint): remove unused import

b6920d9

Merge remote-tracking branch 'upstream/main' into toolchain

b2532db

# Conflicts: # .github/workflows/build.yml

fix(lint): remove unused imports and exceptions

b4d755e

vpa1977 added this pull request to the merge queue Dec 2, 2025

Merged via the queue into rockcrafters:main with commit d7a1e5c Dec 2, 2025
6 of 10 checks passed

vpa1977 mentioned this pull request Dec 7, 2025

Gradle: build rock should install the matching openjdk toolchain version #87

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: detect project's openjdk version#169

feat: detect project's openjdk version#169
vpa1977 merged 28 commits intorockcrafters:mainfrom
vpa1977:toolchain

vpa1977 commented Dec 1, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

vpa1977 commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vpa1977 commented Dec 1, 2025 •

edited

Loading