From 71d8ddd71f1316128a0bafc493191f8bd90ab48b Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Wed, 8 Jan 2025 09:52:41 +0100
Subject: [PATCH] Polishing.

---
 Jenkinsfile                                           |  9 ++++-----
 .../projectservice/ProjectServiceConfiguration.java   |  7 ++-----
 .../projectservice/ProjectServiceOperations.java      | 11 +++++++++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5498bfe..bd71edf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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']}"
+					}
 				}
 			}
 		}
diff --git a/src/main/java/org/springframework/data/release/projectservice/ProjectServiceConfiguration.java b/src/main/java/org/springframework/data/release/projectservice/ProjectServiceConfiguration.java
index 5e92d80..c60d613 100644
--- a/src/main/java/org/springframework/data/release/projectservice/ProjectServiceConfiguration.java
+++ b/src/main/java/org/springframework/data/release/projectservice/ProjectServiceConfiguration.java
@@ -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
diff --git a/src/main/java/org/springframework/data/release/projectservice/ProjectServiceOperations.java b/src/main/java/org/springframework/data/release/projectservice/ProjectServiceOperations.java
index e18ad24..1511353 100644
--- a/src/main/java/org/springframework/data/release/projectservice/ProjectServiceOperations.java
+++ b/src/main/java/org/springframework/data/release/projectservice/ProjectServiceOperations.java
@@ -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.
 	 *