diff --git a/pom.xml b/pom.xml index 92365b6b..4a3e9c45 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.RELEASE + 2.1.2.RELEASE @@ -24,7 +24,7 @@ - Finchley.RELEASE + Greenwich.RELEASE diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/ReleaserProperties.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/ReleaserProperties.java index 437cfc1e..18c82d71 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/ReleaserProperties.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/ReleaserProperties.java @@ -630,7 +630,7 @@ public class ReleaserProperties implements Serializable { /** * Command to be executed to generate release train documentation */ - private String generateReleaseTrainDocsCommand = "./release_train.sh --retrieveversions --version {{version}} --ghpages --auto"; + private String generateReleaseTrainDocsCommand = "bash release_train.sh --retrieveversions --version {{version}} --ghpages --auto"; public static final String SYSTEM_PROPS_PLACEHOLDER = "{{systemProps}}"; diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/BuildCompleted.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/BuildCompleted.java index a942742a..a4411cd8 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/BuildCompleted.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/BuildCompleted.java @@ -16,9 +16,7 @@ package org.springframework.cloud.release.internal.spring; -import org.springframework.context.ApplicationEvent; - -class BuildCompleted extends ApplicationEvent { +class BuildCompleted extends ReleaserTask { /** * Create a new ApplicationEvent. diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserTask.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserTask.java new file mode 100644 index 00000000..4f0776b4 --- /dev/null +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserTask.java @@ -0,0 +1,25 @@ +/* + * Copyright 2013-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.release.internal.spring; + +import org.springframework.context.ApplicationEvent; + +class ReleaserTask extends ApplicationEvent { + ReleaserTask(Object source) { + super(source); + } +} diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCollector.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCollector.java index 6f857f46..b21046cb 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCollector.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCollector.java @@ -26,24 +26,22 @@ import com.jakewharton.fliptables.FlipTableConverters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.event.EventListener; +import org.springframework.context.ApplicationListener; import org.springframework.core.NestedExceptionUtils; import org.springframework.util.StringUtils; -class TaskCollector { +class TaskCollector implements ApplicationListener { private static final Logger log = LoggerFactory.getLogger(TaskCollector.class); private final Queue completedTasks = new ArrayBlockingQueue<>(300); - @EventListener - public void handleTaskCompleted(TaskCompleted taskCompleted) { + private void handleTaskCompleted(TaskCompleted taskCompleted) { this.completedTasks.add(taskCompleted); log.info("Completed task: " + taskCompleted); } - @EventListener - public void handleBuildCompleted(BuildCompleted buildCompleted) { + private void handleBuildCompleted(BuildCompleted buildCompleted) { log.info("Build has finished. Will summarize the results"); List table = this.completedTasks.stream() .map(task -> new Table(task.projectName, task.taskAndException)) @@ -74,6 +72,14 @@ class TaskCollector { } } + @Override + public void onApplicationEvent(ReleaserTask event) { + if (event instanceof TaskCompleted) { + handleTaskCompleted((TaskCompleted) event); + } else if (event instanceof BuildCompleted) { + handleBuildCompleted((BuildCompleted) event); + } + } } class Table { diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCompleted.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCompleted.java index 4668f8de..67c50eed 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCompleted.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/TaskCompleted.java @@ -16,9 +16,7 @@ package org.springframework.cloud.release.internal.spring; -import org.springframework.context.ApplicationEvent; - -class TaskCompleted extends ApplicationEvent { +class TaskCompleted extends ReleaserTask { final String projectName; final TaskAndException taskAndException;