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 d50905ad..e060654e 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,7 +6,6 @@ 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; @@ -18,14 +17,20 @@ 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 { @@ -36,10 +41,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/ReleaserApplication.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/ReleaserApplication.java index b3a82156..fdeb8d83 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/ReleaserApplication.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/ReleaserApplication.java @@ -15,19 +15,11 @@ */ package org.springframework.cloud.release; -import java.io.File; -import java.lang.invoke.MethodHandles; - -import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.release.internal.Releaser; -import org.springframework.cloud.release.internal.build.ProjectBuilder; -import org.springframework.cloud.release.internal.pom.ProjectUpdater; - -import static org.slf4j.LoggerFactory.getLogger; @SpringBootApplication public class ReleaserApplication implements CommandLineRunner { 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 006fb8df..16e694c0 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,7 +18,6 @@ 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; @@ -27,7 +26,11 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(ReleaserProperties.class) class ReleaserConfiguration { - @Bean Releaser releaser(ReleaserProperties properties) { + /*@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)); } }