From 7acb5c9dd0253ea0ece62bb7550c2855915a08f3 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Thu, 9 Mar 2017 09:40:52 +0100
Subject: [PATCH] Added missing packages

---
 .../cloud/release/internal/Releaser.java          | 15 +++++----------
 .../release/spring/ReleaserConfiguration.java     |  7 ++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
index e060654e..d50905ad 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
@@ -6,6 +6,7 @@ import java.lang.invoke.MethodHandles;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cloud.release.internal.build.ProjectBuilder;
 import org.springframework.cloud.release.internal.pom.ProjectUpdater;
 import org.springframework.util.StringUtils;
 
@@ -17,20 +18,14 @@ public class Releaser {
 
 	private final ReleaserProperties properties;
 	private final ProjectUpdater projectUpdater;
-	//private final ProjectBuilder projectBuilder;
+	private final ProjectBuilder projectBuilder;
 
-	/*public Releaser(ReleaserProperties properties,
+	public Releaser(ReleaserProperties properties,
 			ProjectUpdater projectUpdater, ProjectBuilder projectBuilder) {
 		this.properties = properties;
 		this.projectUpdater = projectUpdater;
 		this.projectBuilder = projectBuilder;
 	}
-*/
-	public Releaser(ReleaserProperties properties,
-			ProjectUpdater projectUpdater) {
-		this.properties = properties;
-		this.projectUpdater = projectUpdater;
-	}
 
 	public void release() {
 		try {
@@ -41,10 +36,10 @@ public class Releaser {
 			log.info("\n\nProject was successfully updated");
 			log.info("\n\n\n=== BUILD PROJECT ===\n\nPress ENTER to build the project\n\n");
 			System.in.read();
-			/*this.projectBuilder.build();
+			this.projectBuilder.build();
 			log.info("\nProject was successfully built");
 			log.info("\n\n\n=== COMMITTING AND PUSHING TAGS ===\n\nPress ENTER to commit, tag and push the tag\n\n");
-			System.in.read();*/
+			System.in.read();
 		} catch (IOException e) {
 			throw new IllegalStateException(e);
 		}
diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/spring/ReleaserConfiguration.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/spring/ReleaserConfiguration.java
index 16e694c0..006fb8df 100644
--- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/spring/ReleaserConfiguration.java
+++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/spring/ReleaserConfiguration.java
@@ -18,6 +18,7 @@ package org.springframework.cloud.release.spring;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.release.internal.Releaser;
 import org.springframework.cloud.release.internal.ReleaserProperties;
+import org.springframework.cloud.release.internal.build.ProjectBuilder;
 import org.springframework.cloud.release.internal.pom.ProjectUpdater;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -26,11 +27,7 @@ import org.springframework.context.annotation.Configuration;
 @EnableConfigurationProperties(ReleaserProperties.class)
 class ReleaserConfiguration {
 
-	/*@Bean Releaser releaser(ReleaserProperties properties) {
-		return new Releaser(properties, new ProjectUpdater(properties), new ProjectBuilder(properties));
-	}*/
-
 	@Bean Releaser releaser(ReleaserProperties properties) {
-		return new Releaser(properties, new ProjectUpdater(properties));
+		return new Releaser(properties, new ProjectUpdater(properties), new ProjectBuilder(properties));
 	}
 }