From 46252698418c20bf129637f7b9cd9f50ab699fae Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Feb 2025 10:03:52 +0100 Subject: [PATCH] Use JDK specified in the module for staging repository operations. Closes #106 --- .../data/release/build/BuildOperations.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/release/build/BuildOperations.java b/src/main/java/org/springframework/data/release/build/BuildOperations.java index 44a699c..ca8ed49 100644 --- a/src/main/java/org/springframework/data/release/build/BuildOperations.java +++ b/src/main/java/org/springframework/data/release/build/BuildOperations.java @@ -170,7 +170,7 @@ public class BuildOperations { */ public StagingRepository openStagingRepository(TrainIteration iteration) { - BuildSystem orchestrator = buildSystems.getRequiredPluginFor(iteration.getSupportedProject(Projects.BUILD)); + BuildSystem orchestrator = getRepositoryOrchestrator(iteration.getTrain()); return iteration.isPublic() ? orchestrator.open(iteration.getTrain()) : StagingRepository.EMPTY; } @@ -183,13 +183,21 @@ public class BuildOperations { */ public void closeStagingRepository(Train train, StagingRepository stagingRepository) { - BuildSystem orchestrator = buildSystems.getRequiredPluginFor(train.getSupportedProject(Projects.BUILD)); + BuildSystem orchestrator = getRepositoryOrchestrator(train); if (stagingRepository.isPresent()) { orchestrator.close(train, stagingRepository); } } + private BuildSystem getRepositoryOrchestrator(Train train) { + + SupportedProject project = train.getSupportedProject(BUILD); + BuildSystem orchestrator = buildSystems.getRequiredPluginFor(project); + + return orchestrator.withJavaVersion(executor.detectJavaVersion(project)); + } + /** * Promote the staging repository. * @@ -199,7 +207,7 @@ public class BuildOperations { */ public void releaseStagingRepository(Train train, StagingRepository stagingRepository) { - BuildSystem orchestrator = buildSystems.getRequiredPluginFor(train.getSupportedProject(Projects.BUILD)); + BuildSystem orchestrator = getRepositoryOrchestrator(train); if (stagingRepository.isPresent()) { orchestrator.release(train, stagingRepository);