Spring/spring-data-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use JDK specified in the module for staging repository operations.

Browse Source 
Closes #106
This commit is contained in:
Mark Paluch
2025-02-14 10:03:52 +01:00
parent 05ebce50e2
commit 4625269841
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/springframework/data/release/build/BuildOperations.java
View File

@@ -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);