From bd86f0a59d9c3f4dcde8d785d37247b10930009f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 10 Jun 2020 10:04:54 +0200 Subject: [PATCH] Removed stream from train docs generation --- docs/pom.xml | 2 +- .../org/springframework/cloud/internal/ArtifactFetcher.java | 1 + .../cloud/internal/GenerateReleaseTrainDocs.java | 5 ++++- .../cloud/internal/GenerateReleaseTrainDocsTests.java | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index fcd5fcb..ce174fd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ spring-cloud-starter-build Hoxton.BUILD-SNAPSHOT - pom + jar Spring Cloud Starter Docs Spring Cloud Docs diff --git a/train-docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java b/train-docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java index 3cb06d1..6b2e2a1 100644 --- a/train-docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java +++ b/train-docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java @@ -112,6 +112,7 @@ class ArtifactFetcher { } else { sourcesUrls.add(sourcesUrl + "v" + version + ".zip"); + sourcesUrls.add(sourcesUrl + version + ".zip"); } return sourcesUrls; } diff --git a/train-docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java b/train-docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java index b204b07..b24331a 100644 --- a/train-docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java +++ b/train-docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java @@ -68,8 +68,11 @@ public class GenerateReleaseTrainDocs { List mavenPropertiesToDocsProjects(File file) { Model model = PomReader.readPom(file); Properties properties = model.getProperties(); + // Due to issues with Stream docs in Hoxton we just remove spring cloud stream + // from the docs return properties.entrySet().stream() - .filter(e -> e.getKey().toString().endsWith(".version")) + .filter(e -> e.getKey().toString().endsWith(".version") + && !e.getKey().toString().contains("spring-cloud-stream")) .map(e -> new Project(e.getKey().toString().replace(".version", ""), e.getValue().toString())) .collect(Collectors.toCollection(LinkedList::new)); diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java index 1d69904..1abe59c 100644 --- a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java +++ b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java @@ -44,8 +44,8 @@ public class GenerateReleaseTrainDocsTests { "spring-cloud-consul", "spring-cloud-contract", "spring-cloud-function", "spring-cloud-gateway", "spring-cloud-kubernetes", "spring-cloud-netflix", "spring-cloud-openfeign", "spring-cloud-security", "spring-cloud-sleuth", - "spring-cloud-stream", "spring-cloud-task", "spring-cloud-vault", - "spring-cloud-zookeeper", "spring-cloud-cli"); + "spring-cloud-task", "spring-cloud-vault", "spring-cloud-zookeeper", + "spring-cloud-cli"); BDDAssertions.then(projects) .contains(new Project("spring-cloud-bus", "1.2.3-SNAPSHOT")); }