From ecd0b90e85c8d05783302b174af3d64752c64838 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 31 Oct 2018 10:40:05 +0100 Subject: [PATCH] Fixed debugging and git repos --- .../cloud/release/internal/ReleaserProperties.java | 14 +++++++++----- .../release/internal/post/PostReleaseActions.java | 6 ++++-- 2 files changed, 13 insertions(+), 7 deletions(-) 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 ba20ab82..24c5d1f3 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 @@ -264,16 +264,20 @@ public class ReleaserProperties implements Serializable { */ private boolean updateAllTestSamples = true; + /** + * Project to urls mapping. For each project will clone the test project and will + * update its versions. + */ private Map> allTestSampleUrls = new HashMap>() { { this.put("spring-cloud-sleuth" , Arrays.asList( - "https://github.com/spring-cloud-samples/sleuth-issues/", - "https://github.com/spring-cloud-samples/sleuth-documentation-apps/") + "https://github.com/spring-cloud-samples/sleuth-issues", + "https://github.com/spring-cloud-samples/sleuth-documentation-apps") ); this.put("spring-cloud-contract" , Arrays.asList( - "https://github.com/spring-cloud-samples/spring-cloud-contract-samples/", - "https://github.com/spring-cloud-samples/the-legacy-app/", - "https://github.com/spring-cloud-samples/sc-contract-car-rental/") + "https://github.com/spring-cloud-samples/spring-cloud-contract-samples", + "https://github.com/spring-cloud-samples/the-legacy-app", + "https://github.com/spring-cloud-samples/sc-contract-car-rental") ); } }; diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/post/PostReleaseActions.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/post/PostReleaseActions.java index b9330bda..6a484e6b 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/post/PostReleaseActions.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/post/PostReleaseActions.java @@ -22,6 +22,7 @@ import org.springframework.cloud.release.internal.pom.ProjectPomUpdater; import org.springframework.cloud.release.internal.pom.ProjectVersion; import org.springframework.cloud.release.internal.pom.Projects; import org.springframework.cloud.release.internal.project.ProjectBuilder; +import org.springframework.core.NestedExceptionUtils; /** * @author Marcin Grzejszczak @@ -92,8 +93,8 @@ public class PostReleaseActions implements Closeable { log.info("Updated all samples!"); List exceptionMessages = projectAndExceptions.stream() .filter(ProjectAndException::hasException) - .map(e -> "Project [" + e.key + "] for url [" + e.url + "] has exception [" + Arrays - .toString(e.ex.getStackTrace()) + "]") + .map(e -> "Project [" + e.key + "] for url [" + e.url + "] " + + "has exception [" + NestedExceptionUtils.getMostSpecificCause(e.ex) + "]") .collect(Collectors.toList()); if (!exceptionMessages.isEmpty()) { log.warn("Exceptions were found while updating samples"); @@ -140,6 +141,7 @@ public class PostReleaseActions implements Closeable { .commit(file, "Updated versions after [" + releaseTrainVersion + "] " + "release train and [" + projectVersionForReleaseTrain.version + "] [" + key + "] project release"); + this.projectGitHandler.pushCurrentBranch(file); } private ProjectAndFuture run(String key, String url, Runnable runnable) {