Polishing.

This commit is contained in:
Mark Paluch
2025-01-08 09:52:41 +01:00
parent ac87407457
commit 71d8ddd71f
3 changed files with 15 additions and 12 deletions

9
Jenkinsfile vendored
View File

@@ -44,9 +44,6 @@ pipeline {
agent {
label 'e2-standard-4'
docker {
image 'springci/spring-data-release-tools:0.20'
}
}
options { timeout(time: 4, unit: 'HOURS') }
@@ -67,8 +64,10 @@ pipeline {
steps {
script {
sh "ci/build-spring-data-release-cli.bash"
sh "ci/build-and-distribute.bash ${p['release.version']}"
docker.image("springci/spring-data-release-tools:0.20") {
sh "ci/build-spring-data-release-cli.bash"
sh "ci/build-and-distribute.bash ${p['release.version']}"
}
}
}
}

View File

@@ -15,8 +15,6 @@
*/
package org.springframework.data.release.projectservice;
import java.util.concurrent.Executor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
@@ -39,9 +37,8 @@ class ProjectServiceConfiguration {
@Autowired Logger logger;
@Bean
public ProjectServiceOperations saganOperations(GitOperations operations, ProjectService projectService,
Executor executor) {
return new ProjectServiceOperations(operations, executor, projectService, logger);
public ProjectServiceOperations saganOperations(GitOperations operations, ProjectService projectService) {
return new ProjectServiceOperations(operations, projectService, logger);
}
@Bean

View File

@@ -16,7 +16,6 @@
package org.springframework.data.release.projectservice;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
import java.time.LocalDate;
@@ -45,11 +44,12 @@ import org.springframework.data.release.utils.Logger;
import org.springframework.data.util.Streamable;
import org.springframework.util.Assert;
import com.google.common.util.concurrent.MoreExecutors;
/**
* @author Oliver Gierke
* @author Mark Paluch
*/
@RequiredArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
class ProjectServiceOperations {
@@ -61,6 +61,13 @@ class ProjectServiceOperations {
ProjectService client;
Logger logger;
public ProjectServiceOperations(GitOperations git, ProjectService client, Logger logger) {
this.git = git;
this.executor = MoreExecutors.directExecutor();
this.client = client;
this.logger = logger;
}
/**
* Updates the project metadata for the modules in the given release {@link Train}s.
*